pekka@orca.ndb.mysql.com
4163c91d8e
ndb - debug stuff in LQH
2006-07-10 15:43:47 +02:00
pekka@orca.ndb.mysql.com
a3dcbff671
Merge orca.ndb.mysql.com:/space_old/pekka/ndb/version/my50-1.2167.1.2
...
into orca.ndb.mysql.com:/space_old/pekka/ndb/version/my51-bug18781
2006-07-10 14:07:40 +02:00
pekka@orca.ndb.mysql.com
9f3b47e53c
ndb - bug#18781: close a tiny window (re-commit, try to by-pass merge jam)
2006-07-10 13:59:13 +02:00
pekka@orca.ndb.mysql.com
d525409ba3
Merge orca.ndb.mysql.com:/space_old/pekka/ndb/version/my50-1.2167.1.2
...
into orca.ndb.mysql.com:/space_old/pekka/ndb/version/my51-bug18781
2006-07-10 13:54:26 +02:00
pekka@orca.ndb.mysql.com
7c83e6d201
ndb - bug#18781 : 5.0 : add NODE_START_REP from 5.1 (re-commit, try to by-pass merge jam)
2006-07-10 13:44:15 +02:00
ingo/mydev@chilla.local
4cdb1469e0
Merge chilla.local:/home/mydev/mysql-5.1--main
...
into chilla.local:/home/mydev/mysql-5.1-amerge
2006-07-08 10:54:54 +02:00
tomas@poseidon.ndb.mysql.com
4f7df01b4f
Bug #20843 tests fails randomly with assertion in completeClusterFailed
...
Bug #20902 Alter table invalid schema version with statement-based binlogging
(latter caused by the above)
2006-07-08 03:26:13 +02:00
knielsen@devsrv-b.mysql.com
aebbf0ce00
Merge bk-internal:/home/bk/mysql-5.1
...
into devsrv-b.mysql.com:/data0/knielsen/tmp-5.1
2006-07-07 20:33:46 +02:00
konstantin/kostja@bodhi.local
45b70962ba
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge-with-5.0
2006-07-07 20:51:48 +04:00
knielsen@devsrv-b.mysql.com
8f243bd96a
Merge knielsen@knielsen.mysql.internal:/usr/local/mysql/tmp-5.1
...
into devsrv-b.mysql.com:/data0/knielsen/tmp-5.1
2006-07-07 17:52:14 +02:00
tomas@poseidon.ndb.mysql.com
e64e6d3caf
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-ndb
2006-07-07 17:52:13 +02:00
tomas@poseidon.ndb.mysql.com
5ab4800fc2
Bug #20897 race condition between drop table and suma drop trigger
...
- keep accounting for aoutstanding drop trigger requests
- also lock table object in suma while doing that (should be impossible right now though since dict serializes all requests)
2006-07-07 17:50:45 +02:00
knielsen@ymer.(none)
438d8cea7a
BUG#20902: Test failure in ndb_alter_table3 with statement-based binlogging
...
Disable test cases ndb_alter_table3, ndb_autodiscover3, ndb_dd_advance,
and ndb_multi in statement-based binlogging mode until bug can be fixed.
2006-07-07 17:20:49 +02:00
konstantin/kostja@bodhi.local
377e0862ca
Fixes for Windows compilation failures.
2006-07-07 16:14:07 +04:00
konstantin/kostja@bodhi.netgear
a1f7b448e4
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into bodhi.netgear:/opt/local/work/mysql-5.1-runtime-merge-with-5.0
2006-07-07 13:51:47 +04:00
konstantin/kostja@bodhi.netgear
35b6ad7968
Another post-merge fix.
2006-07-07 13:49:43 +04:00
ingo/mydev@chilla.local
49587d4b37
Merge chilla.local:/home/mydev/mysql-5.1--main
...
into chilla.local:/home/mydev/mysql-5.1-amerge
2006-07-07 09:14:09 +02:00
konstantin@bodhi.netgear
343a5244dc
After merge fixes.
2006-07-07 03:07:45 +04:00
knielsen@ymer.(none)
b5f8c6ea96
Merge ymer.(none):/usr/local/mysql/mysql-5.0-bug19951
...
into ymer.(none):/usr/local/mysql/tmp-5.1
2006-07-07 00:18:03 +02:00
konstantin@bodhi.netgear
4e23f9756d
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into bodhi.netgear:/opt/local/work/mysql-5.1-runtime-merge
2006-07-07 02:18:02 +04:00
tomas@poseidon.ndb.mysql.com
5e3861cb95
removed alter table partition error test since it cannot be made predictable... name will change of created file
2006-07-07 00:18:01 +02:00
knielsen@ymer.(none)
5ea51287d6
BUG#19951: Race conditions in test wait_timeout.
...
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.
2006-07-06 23:49:09 +02:00
ingo@chilla.local
1a98b89334
Merge chilla.local:/home/mydev/mysql-5.1
...
into chilla.local:/home/mydev/mysql-5.1-amerge
2006-07-06 21:45:15 +02:00
tomas@poseidon.ndb.mysql.com
6a6bd5b182
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-ndb
2006-07-06 21:30:55 +02:00
konstantin@bodhi.netgear
01bc761690
Merge bodhi.netgear:/opt/local/work/tmp_merge
...
into bodhi.netgear:/opt/local/work/mysql-5.1-runtime-merge-with-5.0
2006-07-06 22:55:48 +04:00
konstantin@bodhi.netgear
f22a50a93b
Merge bodhi.netgear:/opt/local/work/mysql-5.1-root
...
into bodhi.netgear:/opt/local/work/mysql-5.1-runtime-merge
2006-07-06 22:26:47 +04:00
ingo@chilla.local
8ef4970650
After merge fix.
2006-07-06 20:12:33 +02:00
tomas@poseidon.ndb.mysql.com
8f613e9263
Bug #20820 auto inc table not handled correctly when restored from cluster backup
2006-07-06 20:04:48 +02:00
tomas@poseidon.ndb.mysql.com
1db0b2c6a6
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-ndb
2006-07-06 19:02:38 +02:00
tomas@poseidon.ndb.mysql.com
4199719438
Bug #20820 auto inc table not handled correctly when restored from cluster backup
2006-07-06 18:50:44 +02:00
joerg@trift2.
dcf85ebec4
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into trift2.:/M51/bug20216-5.1
2006-07-06 17:58:31 +02:00
ingo@chilla.local
3671658cbe
Merge chilla.local:/home/mydev/mysql-5.0-bug16218
...
into chilla.local:/home/mydev/mysql-5.1-ateam
2006-07-06 16:09:50 +02:00
joerg@trift2.
26b7bc8eab
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into trift2.:/M51/merge-5.1
2006-07-06 15:52:39 +02:00
tomas@poseidon.ndb.mysql.com
a9348557b2
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-ndb
2006-07-06 15:52:38 +02:00
tomas@poseidon.ndb.mysql.com
deb1884cef
corrected result file
...
- missing order by
2006-07-06 15:51:13 +02:00
ingo@chilla.local
44ed4b8ecb
After merge fixes.
2006-07-06 15:38:47 +02:00
tomas@poseidon.ndb.mysql.com
bcd8fab178
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-ndb
2006-07-06 15:23:23 +02:00
tomas@poseidon.ndb.mysql.com
9944e41f6e
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2006-07-06 15:20:22 +02:00
tomas@poseidon.ndb.mysql.com
ec8771af69
backport of ndb DictCache fix
...
- don't invalidate tables that are in state RETRIEVING
2006-07-06 15:18:00 +02:00
ingo@chilla.local
db0e7774aa
Merge chilla.local:/home/mydev/mysql-5.0-ateam
...
into chilla.local:/home/mydev/mysql-5.1-ateam
2006-07-06 13:18:00 +02:00
jonas@perch.ndb.mysql.com
200deaa99e
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-07-06 12:11:14 +02:00
tomas@poseidon.ndb.mysql.com
4d0d6cff98
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-ndb
2006-07-06 12:11:13 +02:00
tomas@poseidon.ndb.mysql.com
e2db01e3bc
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-ndb
2006-07-06 10:29:00 +02:00
tomas@poseidon.ndb.mysql.com
42d549a9dd
corrected results
2006-07-06 10:20:49 +02:00
ingo@chilla.local
3a252caa86
Merge chilla.local:/home/mydev/mysql-5.1--main
...
into chilla.local:/home/mydev/mysql-5.1-ateam
2006-07-06 10:10:12 +02:00
jonas@perch.ndb.mysql.com
88f816a0fd
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-07-06 09:40:04 +02:00
jonas@perch.ndb.mysql.com
f5ec695c18
ndb - revert bug fix for bug#20442
2006-07-06 09:38:18 +02:00
mskold@linux.site
0c5c9e174b
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/marty/MySQL/mysql-5.1
2006-07-06 09:08:39 +02:00
ngrishakin@ndb15.mysql.com
8d82e2c63a
Merge ngrishakin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into mysql.com:/home/ndbdev/ngrishakin/mysql-5.1-new-ndb
2006-07-06 04:37:53 +02:00
ngrishakin@mysql.com
9323799bb4
ndb_dd_advance test cases
2006-07-06 04:37:03 +02:00