Commits · d1516ed29ea0bd5aae75f3861faf3fa1aec5eb85 · Kirill Smelkov / mariadb

17 Jun, 2007 13 commits
- 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 18 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
- Merge alf.:D:/src/mysql-5.1-maint · e0adab8c
  iggy@alf. authored Jun 15, 2007
```
into  alf.:D:/src/mysql-5.1-maint_winemb
```
  e0adab8c
- Embedded Server doesn't build on Windows. · c15a2647
  iggy@alf. authored Jun 15, 2007
```
- Add build configuration parameter EMBEDDED_ONLY which will configure 
the VS solution to produce only mysql embedded binary.
- Make necessary updates to successfully compile solution.
```
  c15a2647
- Merge chilla.local:/home/mydev/mysql-5.0-axmrg · 9f6ea22b
  istruewing@chilla.local authored Jun 15, 2007
```
into  chilla.local:/home/mydev/mysql-5.1-axmrg
```
  9f6ea22b
- Merge chilla.local:/home/mydev/mysql-5.1-amain · 875cac1f
  istruewing@chilla.local authored Jun 15, 2007
```
into  chilla.local:/home/mydev/mysql-5.1-axmrg
```
  875cac1f
- Merge chilla.local:/home/mydev/mysql-5.1-ateam · b64b1a56
  istruewing@chilla.local authored Jun 15, 2007
```
into  chilla.local:/home/mydev/mysql-5.1-axmrg
```
  b64b1a56
- Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build · 9bc15db2
  tsmith@maint1.mysql.com authored Jun 15, 2007
```
into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
```
  9bc15db2
- Merge quadxeon:m/srv/quadxeon/local/bk/maint/jun14/50 · 3c331f6b
  tsmith@maint1.mysql.com authored Jun 15, 2007
```
into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
```
  3c331f6b
- 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 quadxeon:m/srv/quadxeon/local/bk/maint/jun14/50 · a9ae34b5
  tsmith@maint1.mysql.com authored Jun 15, 2007
```
into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
```
  a9ae34b5
- Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 9f413426
  tsmith@maint1.mysql.com authored Jun 15, 2007
```
into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
```
  9f413426
- 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 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
- Merge mysql.com:/home/ram/work/mysql-5.0-maint · 934ad9e8
  ramil/ram@ramil.myoffice.izhnet.ru authored Jun 15, 2007
```
into  mysql.com:/home/ram/work/mysql-5.1-maint
```
  934ad9e8