Commits · 26d83baeafccef84102c350f4868ee6ddd671c89 · Kirill Smelkov / mariadb

19 Jun, 2007 2 commits
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0 · 26d83bae
  df@pippilotta.erinye.com authored Jun 19, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1
```
  26d83bae
- try again. · f927d505
  df@pippilotta.erinye.com authored Jun 19, 2007
  
  f927d505
18 Jun, 2007 3 commits
- 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
16 Jun, 2007 5 commits
- 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 23 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 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 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
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · a78502b2
  df@pippilotta.erinye.com authored Jun 15, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
```
  a78502b2
- 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
- BUG#27861 merge to 5.1 · c4262055
  df@pippilotta.erinye.com authored Jun 15, 2007
  
  c4262055
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · edd00147
  df@pippilotta.erinye.com authored Jun 15, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
```
  edd00147
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · 973c541b
  df@pippilotta.erinye.com authored Jun 15, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
```
  973c541b
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build · ec40b58a
  df@pippilotta.erinye.com authored Jun 15, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
```
  ec40b58a
- Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0 · b1b1c8ad
  df@pippilotta.erinye.com authored Jun 15, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0
```
  b1b1c8ad
- Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1 · 2ee55889
  df@pippilotta.erinye.com authored Jun 15, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1
```
  2ee55889
- Added yassl and taocrypt sources to mysqlclientlib · 7c02fbd1
  georg@bing.site authored Jun 15, 2007
  
  7c02fbd1
- Merge damien-katzs-computer.local:/Users/dkatz/mysql51 · 3a1a5613
  dkatz@damien-katzs-computer.local authored Jun 14, 2007
```
into  damien-katzs-computer.local:/Users/dkatz/51_win
```
  3a1a5613
- Merge quadxeon:m/srv/quadxeon/local/bk/maint/jun14/51 · 664fa012
  tsmith@maint1.mysql.com authored Jun 15, 2007
```
into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
```
  664fa012
14 Jun, 2007 7 commits
- Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build · 91809003
  tsmith@quadxeon.mysql.com authored Jun 15, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun14/51
```
  91809003
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 85caa354
  cmiller@zippy.cornsilk.net authored Jun 14, 2007
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
```
  85caa354
- Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-build · 87fdad4c
  tsmith@quadxeon.mysql.com authored Jun 14, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun14/50
```
  87fdad4c
- Merge trift2.:/MySQL/M50/push-5.0 · 5b221805
  joerg@trift2. authored Jun 14, 2007
```
into  trift2.:/MySQL/M51/push-5.1
```
  5b221805
- Merge trift2.:/MySQL/M41/push-4.1 · 9ab46d00
  joerg@trift2. authored Jun 14, 2007
```
into  trift2.:/MySQL/M50/push-5.0
```
  9ab46d00
- Merge trift2.:/MySQL/M41/mysql-4.1 · b5c9cab5
  joerg@trift2. authored Jun 14, 2007
```
into  trift2.:/MySQL/M41/push-4.1
```
  b5c9cab5
- Merge trift2.:/MySQL/M50/mysql-5.0 · ae1ff2e8
  joerg@trift2. authored Jun 14, 2007
```
into  trift2.:/MySQL/M50/push-5.0
```
  ae1ff2e8