Commits · 2a03eaf8e7a0328e0f3bd3a5fe640be81fde8133 · Kirill Smelkov / mariadb

21 Jun, 2007 1 commit
- Merge trift2.:/MySQL/M50/mysql-5.0 · 2a03eaf8
  joerg@trift2. authored Jun 21, 2007
```
into  trift2.:/MySQL/M50/push-5.0
```
  2a03eaf8
19 Jun, 2007 3 commits
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 325b8835
  kostja@bodhi.(none) authored Jun 19, 2007
```
into  bodhi.(none):/opt/local/work/mysql-5.0-runtime
```
  325b8835
- Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0 · 7eea7fff
  df@pippilotta.erinye.com authored Jun 19, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0
```
  7eea7fff
- try again. · f927d505
  df@pippilotta.erinye.com authored Jun 19, 2007
  
  f927d505
18 Jun, 2007 13 commits
- Merge trift2.:/MySQL/M41/push-4.1 · 7e060d76
  joerg@trift2. authored Jun 18, 2007
```
into  trift2.:/MySQL/M50/push-5.0
```
  7e060d76
- Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0-build · f0d63496
  joerg@trift2. authored Jun 18, 2007
```
into  trift2.:/MySQL/M50/push-5.0
```
  f0d63496
- Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1-build · 57853e7d
  joerg@trift2. authored Jun 18, 2007
```
into  trift2.:/MySQL/M41/push-4.1
```
  57853e7d
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build · 03d9ef1f
  df@pippilotta.erinye.com authored Jun 18, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
```
  03d9ef1f
- Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build · 0ef1abae
  df@pippilotta.erinye.com authored Jun 18, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
```
  0ef1abae
- Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1-build · 1067f08a
  df@pippilotta.erinye.com authored Jun 18, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build
```
  1067f08a
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build · e9387bf5
  df@pippilotta.erinye.com authored Jun 18, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
```
  e9387bf5
- don't use bk cset in commit e-mails · 94a3e239
  df@pippilotta.erinye.com authored Jun 18, 2007
  
  94a3e239
- Merge trift2.:/MySQL/M41/push-4.1 · cf95b9e4
  joerg@trift2. authored Jun 18, 2007
```
into  trift2.:/MySQL/M50/push-5.0
```
  cf95b9e4
- Merge trift2.:/MySQL/M41/clone-4.1 · 1d09be38
  joerg@trift2. authored Jun 18, 2007
```
into  trift2.:/MySQL/M41/push-4.1
```
  1d09be38
- Merge trift2.:/MySQL/M41/mysql-4.1 · b9cc9dbb
  joerg@trift2. authored Jun 18, 2007
```
into  trift2.:/MySQL/M41/push-4.1
```
  b9cc9dbb
- Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 · 491e471f
  svoj@june.mysql.com authored Jun 18, 2007
```
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
```
  491e471f
- Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0 · f369105a
  df@pippilotta.erinye.com authored Jun 18, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0
```
  f369105a
17 Jun, 2007 7 commits
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · 45479574
  tomas@whalegate.ndb.mysql.com authored Jun 17, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-engines
```
  45479574
- correct test and result · 8a08ac40
  tomas@whalegate.ndb.mysql.com authored Jun 17, 2007
  
  8a08ac40
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · 8eb940de
  tomas@whalegate.ndb.mysql.com authored Jun 17, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-engines
```
  8eb940de
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · b5f30a99
  tomas@whalegate.ndb.mysql.com authored Jun 17, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
```
  b5f30a99
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · 9c5183ac
  tomas@whalegate.ndb.mysql.com authored Jun 17, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-engines
```
  9c5183ac
- BUG#27640 · 9e3c14fa
  tomas@whalegate.ndb.mysql.com authored Jun 17, 2007
```
- correct test and result file
```
  9e3c14fa
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · 95ed4128
  tomas@whalegate.ndb.mysql.com authored Jun 17, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-engines
```
  95ed4128
16 Jun, 2007 3 commits
- Merge chilla.local:/home/mydev/mysql-5.0-amain · 70600c15
  istruewing@chilla.local authored Jun 16, 2007
```
into  chilla.local:/home/mydev/mysql-5.0-axmrg
```
  70600c15
- Merge bk-internal:/home/bk/mysql-5.0-maint · 872c090b
  df@pippilotta.erinye.com authored Jun 16, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
```
  872c090b
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work · b2b965b5
  df@pippilotta.erinye.com authored Jun 16, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
```
  b2b965b5
15 Jun, 2007 13 commits
- binlog.result, binlog.test: · 89111655
  tsmith@quadxeon.mysql.com authored Jun 15, 2007
```
  Post-merge fix: replace xid=* with XID to isolate from number of transactions
```
  89111655
- Fixed warnings raised from mysqltest (unknown -- commands) · 4b427bde
  malff/marcsql@weblab.(none) authored Jun 15, 2007
  
  4b427bde
- manual merge · e20232cf
  malff/marcsql@weblab.(none) authored Jun 15, 2007
  
  e20232cf
- Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-build · 20956274
  tsmith@quadxeon.mysql.com authored Jun 15, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun14/50
```
  20956274
- Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 73035c27
  tsmith@quadxeon.mysql.com authored Jun 15, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun14/50
```
  73035c27
- Merge chilla.local:/home/mydev/mysql-4.1-axmrg · f95d0b0f
  istruewing@chilla.local authored Jun 15, 2007
```
into  chilla.local:/home/mydev/mysql-5.0-axmrg
```
  f95d0b0f
- Merge chilla.local:/home/mydev/mysql-5.0-amain · 676ea582
  istruewing@chilla.local authored Jun 15, 2007
```
into  chilla.local:/home/mydev/mysql-5.0-axmrg
```
  676ea582
- Merge chilla.local:/home/mydev/mysql-5.0-ateam · dceae355
  istruewing@chilla.local authored Jun 15, 2007
```
into  chilla.local:/home/mydev/mysql-5.0-axmrg
```
  dceae355
- Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-base · b80692b9
  malff/marcsql@weblab.(none) authored Jun 15, 2007
```
into  weblab.(none):/home/marcsql/TREE/mysql-5.0-rt-merge
```
  b80692b9
- Merge chilla.local:/home/mydev/mysql-4.1-amain · 52200be6
  istruewing@chilla.local authored Jun 15, 2007
```
into  chilla.local:/home/mydev/mysql-4.1-axmrg
```
  52200be6
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 08ec6652
  cmiller@zippy.cornsilk.net authored Jun 15, 2007
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
```
  08ec6652
- follow-up fix · c64fca9e
  df@pippilotta.erinye.com authored Jun 15, 2007
  
  c64fca9e
- Backport of · 44c35240
  ramil/ram@mysql.com/ramil.myoffice.izhnet.ru authored Jun 15, 2007
```
mysql-test/include/wait_for_slave_io_to_stop.inc
mysql-test/include/wait_for_slave_sql_to_stop.inc
mysql-test/include/wait_for_slave_to_start.inc
mysql-test/include/wait_for_slave_to_stop.inc
from 5.1
```
  44c35240