Commits · 77285cb6501360b7bf566cb1c094703d97f5b8fc · Kirill Smelkov / mariadb

11 Jul, 2006 1 commit
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 77285cb6
  kostja@bodhi.local authored Jul 11, 2006
```
into  bodhi.local:/opt/local/work/mysql-5.0-runtime-merge-41
```
  77285cb6
10 Jul, 2006 16 commits
- Fix yet another Windows build failure: "true" -> TRUE · 4f3636dd
  kostja@bodhi.local authored Jul 11, 2006
  
  4f3636dd
- Fix a Windows build failure. · 171bcbf3
  kostja@bodhi.local authored Jul 10, 2006
  
  171bcbf3
- Fix test results to be vardir-independent. · d7f5d73f
  kostja@bodhi.local authored Jul 10, 2006
  
  d7f5d73f
- Merge orca.ndb.mysql.com:/space_old/pekka/ndb/version/my50 · 72fa4883
  pekka@orca.ndb.mysql.com authored Jul 10, 2006
```
into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my50-1.2167.1.2
```
  72fa4883
- ndb - bug#18781: close a tiny window (re-commit, try to by-pass merge jam) · 9f3b47e5
  pekka@orca.ndb.mysql.com authored Jul 10, 2006
  
  9f3b47e5
- ndb - bug#18781 : 5.0 : add NODE_START_REP from 5.1 (re-commit, try to by-pass merge jam) · 7c83e6d2
  pekka@orca.ndb.mysql.com authored Jul 10, 2006
  
  7c83e6d2
- A post-merge fix (Bug#8706 "temporary table with data directory option · f183c084
  kostja@bodhi.local authored Jul 10, 2006
```
fails"
```
  f183c084
- Add sql_locale.cpp to our windows build scripts. · 746749ed
  kostja@bodhi.local authored Jul 10, 2006
  
  746749ed
- Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0 · 023f4435
  pekka@orca.ndb.mysql.com authored Jul 10, 2006
```
into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my50
```
  023f4435
- ndb - bug#20847: non-debug compile fix (repeat since cannot merge 4.1->5.0) · bdc7a14b
  pekka@orca.ndb.mysql.com authored Jul 10, 2006
  
  bdc7a14b
- Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 · 4fbf8f2f
  joerg@trift2. authored Jul 10, 2006
```
into  trift2.:/M50/mysql-5.0
```
  4fbf8f2f
- support-files/mysql.spec.sh : Fix a typing error. · 6ec62524
  joerg@trift2. authored Jul 10, 2006
  
  6ec62524
- Merge trift2.:/M50/clone-5.0 · 94ef9ca9
  joerg@trift2. authored Jul 10, 2006
```
into  trift2.:/M50/back23-5.0
```
  94ef9ca9
- Merge orca.ndb.mysql.com:/space/pekka/ndb/version/my50 · 7433d5cc
  pekka@orca.ndb.mysql.com authored Jul 10, 2006
```
into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my50-bug20847
```
  7433d5cc
- mysql-test/Makefile.am: fix cp of mode 444 files (re-commit) · 79cc3bed
  pekka@orca.ndb.mysql.com authored Jul 10, 2006
  
  79cc3bed
- Merge orca.ndb.mysql.com:/space/pekka/ndb/version/my50 · 71aa094c
  pekka@orca.ndb.mysql.com authored Jul 10, 2006
```
into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my50-bug20847
```
  71aa094c
09 Jul, 2006 1 commit
- Fix compiler warnings in sql_udf.h: ISO C++ forbids casting · 2ab1e065
  kostja@bodhi.local authored Jul 09, 2006
```
between pointer to function and pointer to object.
```
  2ab1e065
08 Jul, 2006 3 commits
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · f1d949a8
  kostja@bodhi.local authored Jul 08, 2006
```
into  bodhi.local:/opt/local/work/mysql-5.0-runtime-merge-41
```
  f1d949a8
- 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
- A post-merge fix. · ff1947da
  kostja@bodhi.local authored Jul 08, 2006
  
  ff1947da
07 Jul, 2006 5 commits
- Merge bodhi.local:/opt/local/work/tmp_merge · a2c0cdd7
  kostja@bodhi.local authored Jul 08, 2006
```
into  bodhi.local:/opt/local/work/mysql-5.0-runtime-merge-41
```
  a2c0cdd7
- Cleanups: ignore more files. · 96f4c10d
  kostja@bodhi.local authored Jul 08, 2006
  
  96f4c10d
- Merge bodhi.local:/opt/local/work/mysql-5.0-root · 7bf73ac3
  kostja@bodhi.local authored Jul 07, 2006
```
into  bodhi.local:/opt/local/work/mysql-5.0-runtime
```
  7bf73ac3
- Merge mysql.com:/space_old/pekka/ndb/version/my41-bug20847 · c9bc03c3
  pekka@mysql.com/orca.ndb.mysql.com authored Jul 07, 2006
```
into  mysql.com:/space_old/pekka/ndb/version/my50-bug20847
```
  c9bc03c3
- ndb - bug#20847 : DbtupTabDesMan: add merge with left buddies · 7ed021f9
  pekka@mysql.com authored Jul 07, 2006
  
  7ed021f9
06 Jul, 2006 14 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