Commits · 8ce20e52df76eba8645d7af0e9db8ea3d4e69a5f · Kirill Smelkov / mariadb

07 Jul, 2007 6 commits
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · 8ce20e52
  df@pippilotta.erinye.com authored Jul 07, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
```
  8ce20e52
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0 · 3ad1cd6b
  df@pippilotta.erinye.com authored Jul 07, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
```
  3ad1cd6b
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1 · 58590de5
  df@pippilotta.erinye.com authored Jul 07, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
```
  58590de5
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1 · a419ead3
  df@pippilotta.erinye.com authored Jul 07, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
```
  a419ead3
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · f76b0199
  df@pippilotta.erinye.com authored Jul 07, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
```
  f76b0199
- revert previous patch · b717df24
  df@pippilotta.erinye.com authored Jul 07, 2007
  
  b717df24
06 Jul, 2007 4 commits
- Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build · a6c6d283
  df@pippilotta.erinye.com authored Jul 06, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
```
  a6c6d283
- Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-build · 96efa7b0
  df@pippilotta.erinye.com authored Jul 06, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
```
  96efa7b0
- Merge labbari.dsl.inet.fi:/home/my/bk/mysql-5.0-marvel · 12a7af37
  jani@labbari.dsl.inet.fi authored Jul 06, 2007
```
into  labbari.dsl.inet.fi:/home/my/bk/mysql-5.1-marvel
```
  12a7af37
- Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 · 7d7524d9
  jani@labbari.dsl.inet.fi authored Jul 06, 2007
```
into  labbari.dsl.inet.fi:/home/my/bk/mysql-5.0-marvel
```
  7d7524d9
05 Jul, 2007 2 commits

Merge chorlton.adsl.perkin.org.uk:/Users/jonathan/mysql/bk/mysql-5.0 · 9d701c6d
jonathan@chorlton.adsl.perkin.org.uk authored Jul 05, 2007
```
into  chorlton.adsl.perkin.org.uk:/Users/jonathan/mysql/bk/mysql-5.1
```
9d701c6d

jonathan@chorlton.adsl.perkin.org.uk authored Jul 05, 2007

This script incorrectly generates the mysql_install_db file, causing the
problems detailed in bug#28585. The automake infrastructure correctly
generates the script, so just copy it in place.

48dc7241

03 Jul, 2007 6 commits
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb · 0a1c65b6
  tomas@whalegate.ndb.mysql.com authored Jul 03, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl
```
  0a1c65b6
- Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b27345 · 14df7c70
  bar@bar.myoffice.izhnet.ru authored Jul 03, 2007
```
into  mysql.com:/home/bar/mysql-work/mysql-5.1-new-rpl
```
  14df7c70
- Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl · 825570f5
  bar@bar.myoffice.izhnet.ru authored Jul 03, 2007
```
into  mysql.com:/home/bar/mysql-work/mysql-5.0.b27345
```
  825570f5
- Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca · af76e150
  jonas@perch.ndb.mysql.com authored Jul 03, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
```
  af76e150
- Merge perch.ndb.mysql.com:/home/jonas/src/50-work · b940b92e
  jonas@perch.ndb.mysql.com authored Jul 03, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
```
  b940b92e
- ndb - bug#29354 - Incorrect handling of replica REDO during SR (5.0) · 71996bd6
  jonas@perch.ndb.mysql.com authored Jul 03, 2007
```
  Not very clever fix for DIH incorrect REDO handling
  - Dont report GCP_SAVE_CONF until first LCP has been complete during NR
```
  71996bd6
02 Jul, 2007 13 commits
- post-merge fix · 91ca4246
  lars/lthalmann@mysql.com/dl145k.mysql.com authored Jul 02, 2007
  
  91ca4246
- Merge mysql.com:/nfsdisk1/lars/bk/mysql-5.0-rpl · 5c811235
  lars/lthalmann@dl145k.mysql.com authored Jul 02, 2007
```
into  mysql.com:/nfsdisk1/lars/bk/mysql-5.1-new-rpl
```
  5c811235
- Merge mysql.com:/nfsdisk1/lars/bk/mysql-4.1-rpl · 4bbac9ac
  lars/lthalmann@dl145j.mysql.com authored Jul 02, 2007
```
into  mysql.com:/nfsdisk1/lars/bk/mysql-5.0-rpl
```
  4bbac9ac
- Merge mysql.com:/nfsdisk1/lars/bk/mysql-5.1 · 4be62a8e
  lars/lthalmann@dl145k.mysql.com authored Jul 02, 2007
```
into  mysql.com:/nfsdisk1/lars/bk/mysql-5.1-new-rpl
```
  4be62a8e
- Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime · f969f000
  lars/lthalmann@dl145k.mysql.com authored Jul 02, 2007
```
into  mysql.com:/nfsdisk1/lars/bk/mysql-5.0-rpl
```
  f969f000
- Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca · a3c733c3
  jonas@perch.ndb.mysql.com authored Jul 02, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
```
  a3c733c3
- ndb - bug#29364 - port merge (5.0 -> 5.1) · 627a56be
  jonas@perch.ndb.mysql.com authored Jul 02, 2007
  
  627a56be
- Merge perch.ndb.mysql.com:/home/jonas/src/50-work · b47ee8ce
  jonas@perch.ndb.mysql.com authored Jul 02, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
```
  b47ee8ce
- ndb - bug#29364 - "SQL queries hang while data node in start phase 5" · f6c0acde
  jonas@perch.ndb.mysql.com authored Jul 02, 2007
```
  In TC init node status for already started nodes during node restart
  (not present in 5.1)
```
  f6c0acde
- Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl · a4c81471
  lars/lthalmann@dl145j.mysql.com authored Jul 02, 2007
```
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
```
  a4c81471
- Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl · 6f6492b7
  lars/lthalmann@dl145j.mysql.com authored Jul 02, 2007
```
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
```
  6f6492b7
- Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-4.1-rpl · a464b1ab
  lars/lthalmann@mysql.com/dl145j.mysql.com authored Jul 02, 2007
```
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge
```
  a464b1ab
- A post-merge fix. · 1550a5dd
  kostja@bodhi.(none) authored Jul 02, 2007
  
  1550a5dd
01 Jul, 2007 9 commits
- Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime · aea880dd
  kostja@bodhi.(none) authored Jul 02, 2007
```
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
```
  aea880dd
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 674d1027
  kostja@bodhi.(none) authored Jul 02, 2007
```
into  bodhi.(none):/opt/local/work/mysql-5.0-runtime
```
  674d1027
- Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime · 7ce3cada
  kostja@bodhi.(none) authored Jul 02, 2007
```
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
```
  7ce3cada
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 6a5ce49d
  kostja@bodhi.(none) authored Jul 02, 2007
```
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
```
  6a5ce49d
- Update a missed test result. · 2d8decab
  kostja@bodhi.(none) authored Jul 02, 2007
  
  2d8decab
- Corrected a test case. · 2efac224
  igor@olga.mysql.com authored Jul 01, 2007
  
  2efac224
- Made test case platform independent. · eea7dd0a
  igor@olga.mysql.com authored Jul 01, 2007
  
  eea7dd0a
- Post-merge fix. · f93f44e7
  igor@olga.mysql.com authored Jun 30, 2007
  
  f93f44e7
- Merge olga.mysql.com:/home/igor/mysql-5.0-opt · 259fdbf9
  igor@olga.mysql.com authored Jun 30, 2007
```
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.1-opt
```
  259fdbf9