Commits · 94ef9ca9caa07e4df69e2a21f6e8225f3d178a87 · Kirill Smelkov / mariadb

10 Jul, 2006 1 commit
- Merge trift2.:/M50/clone-5.0 · 94ef9ca9
  joerg@trift2. authored Jul 10, 2006
```
into  trift2.:/M50/back23-5.0
```
  94ef9ca9
08 Jul, 2006 1 commit
- Merge chilla.local:/home/mydev/mysql-5.0--main · f631765a
  ingo/mydev@chilla.local authored Jul 08, 2006
```
into  chilla.local:/home/mydev/mysql-5.0-amerge
```
  f631765a
06 Jul, 2006 18 commits
- Merge ymer.(none):/usr/local/mysql/mysql-5.0-bug19951 · 31ddb041
  knielsen@ymer.(none) authored Jul 06, 2006
```
into  ymer.(none):/usr/local/mysql/tmp-5.0
```
  31ddb041
- BUG#19951: Race conditions in test wait_timeout. · 5ea51287
  knielsen@ymer.(none) authored Jul 06, 2006
```
Fix random failures in test 'wait_timeout' that depend on exact timing.

1. Force a reconnect initially if necessary, as otherwise slow startup
might have caused a connection timeout before the test can even start.

2. Explicitly disconnect the first connection to remove confusion about
which connection aborts from timeout, causing test failure.
```
  5ea51287
- Merge chilla.local:/home/mydev/mysql-5.0 · b9004843
  ingo@chilla.local authored Jul 06, 2006
```
into  chilla.local:/home/mydev/mysql-5.0-amerge
```
  b9004843
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 73064141
  tomas@poseidon.ndb.mysql.com authored Jul 06, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
```
  73064141
- Merge chilla.local:/home/mydev/mysql-5.0-bug16218 · f031de4f
  ingo@chilla.local authored Jul 06, 2006
```
into  chilla.local:/home/mydev/mysql-5.0-ateam
```
  f031de4f
- Merge chilla.local:/home/mydev/mysql-5.0 · 591d461d
  ingo@chilla.local authored Jul 06, 2006
```
into  chilla.local:/home/mydev/mysql-5.0-bug16218
```
  591d461d
- Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 · 8816f980
  tomas@poseidon.ndb.mysql.com authored Jul 06, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
```
  8816f980
- Bug #20820 auto inc table not handled correctly when restored from cluster backup · 41997194
  tomas@poseidon.ndb.mysql.com authored Jul 06, 2006
  
  41997194
- Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 · a873811a
  joerg@trift2. authored Jul 06, 2006
```
into trift2.:/M50/merge-5.0
```
  a873811a
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 27a8cade
  tomas@poseidon.ndb.mysql.com authored Jul 06, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
```
  27a8cade
- Merge chilla.local:/home/mydev/mysql-5.0 · 518fcc8f
  ingo@chilla.local authored Jul 06, 2006
```
into  chilla.local:/home/mydev/mysql-5.0-ateam
```
  518fcc8f
- Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 · e68194dc
  tomas@poseidon.ndb.mysql.com authored Jul 06, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
```
  e68194dc
- Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 · 9944e41f
  tomas@poseidon.ndb.mysql.com authored Jul 06, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
```
  9944e41f
- backport of ndb DictCache fix · ec8771af
  tomas@poseidon.ndb.mysql.com authored Jul 06, 2006
```
- don't invalidate tables that are in state RETRIEVING
```
  ec8771af
- Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · 72bdce70
  jonas@perch.ndb.mysql.com authored Jul 06, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
```
  72bdce70
- Merge perch.ndb.mysql.com:/home/jonas/src/50-work · 52a28cfa
  jonas@perch.ndb.mysql.com authored Jul 06, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
```
  52a28cfa
- ndb - revert bug fix for bug#20442 · f5ec695c
  jonas@perch.ndb.mysql.com authored Jul 06, 2006
  
  f5ec695c
- Merge xiphis.org:/home/antony/work2/mysql-5.0-engines · 4eee50de
  acurtis@xiphis.org authored Jul 05, 2006
```
into  xiphis.org:/home/antony/work2/p2-bug8706.3-merge-5.0
```
  4eee50de
05 Jul, 2006 11 commits
- ndbd: added missing jamEntry(); · f413bc2f
  tomas@poseidon.ndb.mysql.com authored Jul 05, 2006
  
  f413bc2f
- Bug #20419 ndbd --nowait-nodes=<id_of_running_node> fails · aacb7056
  tomas@poseidon.ndb.mysql.com authored Jul 05, 2006
```
- updated error message to more correctly reflect the issue
```
  aacb7056
- Extend the Perl script running the test suite to produce a "Logging:" line... · c9dc1184
  joerg@mysql.com authored Jul 05, 2006
```
Extend the Perl script running the test suite to produce a "Logging:" line (like the shell script does).
```
  c9dc1184
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 8b57568a
  tomas@poseidon.ndb.mysql.com authored Jul 05, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
```
  8b57568a
- Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 · a0ab5ae0
  tomas@poseidon.ndb.mysql.com authored Jul 05, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
```
  a0ab5ae0
- Bug #18863 NDB node fails to restart, cluster stuck in state trying to restart it. · 04ae9715
  tomas@poseidon.ndb.mysql.com authored Jul 05, 2006
```
- remove some event code to get rid of some bugs
```
  04ae9715
- After merge fix · b21acbe0
  ingo@mysql.com authored Jul 05, 2006
  
  b21acbe0
- Merge mysql.com:/home/mydev/mysql-4.1-bug19835 · 4c008059
  ingo@mysql.com authored Jul 05, 2006
```
into  mysql.com:/home/mydev/mysql-5.0-ateam
```
  4c008059
- Merge mysql.com:/home/mydev/mysql-4.1-bug17877 · 5025bf32
  ingo@mysql.com authored Jul 05, 2006
```
into  mysql.com:/home/mydev/mysql-5.0-ateam
```
  5025bf32
- Merge mysql.com:/home/mydev/mysql-4.1-bug14400 · a21071d9
  ingo@mysql.com authored Jul 05, 2006
```
into  mysql.com:/home/mydev/mysql-5.0-ateam
```
  a21071d9
- Merge mysql.com:/home/mydev/mysql-4.1-bug11824 · 20a152d5
  ingo@mysql.com authored Jul 05, 2006
```
into  mysql.com:/home/mydev/mysql-5.0-ateam
```
  20a152d5
04 Jul, 2006 9 commits
- Merge mysql.com:/home/mydev/mysql-4.0-bug14400 · 40c10347
  ingo@mysql.com authored Jul 04, 2006
```
into  mysql.com:/home/mydev/mysql-4.1-bug14400
```
  40c10347
- Merge bk-internal:/home/bk/mysql-5.0 · ff0041e8
  knielsen@mysql.com authored Jul 04, 2006
```
into  mysql.com:/data0/knielsen/tmp-5.0
```
  ff0041e8
- ndb - ps_7ndb as discovered by pb · d0146162
  jonas@mc01.ndb.mysql.com authored Jul 04, 2006
```
  fix race in scan close
```
  d0146162
- Merge bk-internal:/home/bk/mysql-5.0 · 7892dca1
  knielsen@mysql.com authored Jul 04, 2006
```
into  mysql.com:/data0/knielsen/tmp-5.0
```
  7892dca1
- Merge tomas@poseidon:mysql-5.0-main · 795eafbc
  jonas@perch.ndb.mysql.com authored Jul 04, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
```
  795eafbc
- Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 · 0b2024ac
  tomas@poseidon.ndb.mysql.com authored Jul 04, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
```
  0b2024ac
- When building RPMs, use the Perl script to run the tests, to automatically check SSL. · be5f4826
  joerg@mysql.com authored Jul 04, 2006
  
  be5f4826
- Merge mysqldev@production:my/mysql-5.0-release · 70629938
  knielsen@rt.int.sifira.dk authored Jul 04, 2006
```
into  rt.int.sifira.dk:/usr/local/mysql/tmp-5.0
```
  70629938
- Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 · 1e4ccec8
  tomas@poseidon.ndb.mysql.com authored Jul 04, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-release
```
  1e4ccec8