Commits · 4f6b3d107bca9174b286d93af8b440061254b0a3 · nexedi / MariaDB

18 Jun, 2007 10 commits
- Merge trift2.:/MySQL/M50/push-5.0 · 4f6b3d10
  joerg@trift2. authored Jun 18, 2007
```
into  trift2.:/MySQL/M51/push-5.1
```
  4f6b3d10
- 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 mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines · 674675a7
  svoj@june.mysql.com authored Jun 18, 2007
```
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
```
  674675a7
- Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1 · 621dd172
  svoj@june.mysql.com authored Jun 18, 2007
```
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
```
  621dd172
- 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 pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0 · 7013c96f
  df@pippilotta.erinye.com authored Jun 18, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1
```
  7013c96f
- Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1 · 7cdb354d
  df@pippilotta.erinye.com authored Jun 18, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1
```
  7cdb354d
- 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 20 commits
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-engines · 1bfd45c2
  tomas@whalegate.ndb.mysql.com authored Jun 17, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-engines
```
  1bfd45c2
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb · 795b9de4
  tomas@whalegate.ndb.mysql.com authored Jun 17, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-engines
```
  795b9de4
- 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
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · 04ea0c33
  tomas@whalegate.ndb.mysql.com authored Jun 17, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
  04ea0c33
- correct test and result · 8a08ac40
  tomas@whalegate.ndb.mysql.com authored Jun 17, 2007
  
  8a08ac40
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb · 0d8c48da
  tomas@whalegate.ndb.mysql.com authored Jun 17, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-engines
```
  0d8c48da
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · d20cc54c
  tomas@whalegate.ndb.mysql.com authored Jun 17, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
  d20cc54c
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-engines · d1516ed2
  tomas@whalegate.ndb.mysql.com authored Jun 17, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-engines
```
  d1516ed2
- 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-engines · 885ca40f
  tomas@whalegate.ndb.mysql.com authored Jun 17, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-engines
```
  885ca40f
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb · 6b8e7c94
  tomas@whalegate.ndb.mysql.com authored Jun 17, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-engines
```
  6b8e7c94
- Bug #28989 hpux11 ps_row warnings · ff804bc5
  tomas@whalegate.ndb.mysql.com authored Jun 17, 2007
```
- do not print 701 dictionary busy error
```
  ff804bc5
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb · baf9e764
  tomas@whalegate.ndb.mysql.com authored Jun 17, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-engines
```
  baf9e764
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · 1e7fdaab
  tomas@whalegate.ndb.mysql.com authored Jun 17, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
  1e7fdaab
- 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-engines · a61907f4
  tomas@whalegate.ndb.mysql.com authored Jun 17, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-engines
```
  a61907f4
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb · 830be6de
  tomas@whalegate.ndb.mysql.com authored Jun 17, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-engines
```
  830be6de
- 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 9 commits
- Merge chilla.local:/home/mydev/mysql-5.0-axmrg · 7d2fc984
  istruewing@chilla.local authored Jun 16, 2007
```
into  chilla.local:/home/mydev/mysql-5.1-axmrg
```
  7d2fc984
- Merge chilla.local:/home/mydev/mysql-5.1-amain · 938fc3d6
  istruewing@chilla.local authored Jun 16, 2007
```
into  chilla.local:/home/mydev/mysql-5.1-axmrg
```
  938fc3d6
- 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
- Bug #28949 · 8d311488
  tomas@whalegate.ndb.mysql.com authored Jun 16, 2007
```
- handler binlog's must be shutdoem before logger.cleanup_base
```
  8d311488
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · 0cf4955a
  df@pippilotta.erinye.com authored Jun 16, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
```
  0cf4955a
- Merge bk-internal:/home/bk/mysql-5.1-new-maint · 274bdc62
  df@pippilotta.erinye.com authored Jun 16, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
```
  274bdc62
- 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.1-build-work · c8f14b1a
  df@pippilotta.erinye.com authored Jun 16, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
```
  c8f14b1a
- 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 1 commit
- 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