pekka@clam.(none)
2082a9e35b
Merge clam.ndb.mysql.com:/export/space/pekka/ndb/version/my50-bug24028
...
into clam.ndb.mysql.com:/export/space/pekka/ndb/version/my51-bug24028
2007-03-22 07:40:04 +01:00
tomas@whalegate.ndb.mysql.com
6e7528bd34
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-03-22 05:45:17 +01:00
tsmith@quadxeon.mysql.com
54e7bc8daa
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
2007-03-22 01:04:39 +01:00
tomas@poseidon.mysql.com
e1cd5c67dc
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-03-21 16:34:23 +01:00
jonas@perch.ndb.mysql.com
ca00e63853
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
2007-03-21 15:37:14 +01:00
jonas@perch.ndb.mysql.com
2cd7ff4e8a
Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-03-21 15:36:23 +01:00
jonas@perch.ndb.mysql.com
8a149f2638
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
2007-03-21 15:35:22 +01:00
tomas@whalegate.ndb.mysql.com
db9a44ce49
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-telco-gca
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca
2007-03-21 09:29:03 +01:00
tomas@whalegate.ndb.mysql.com
d2f8bd9ae7
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-03-21 09:28:22 +01:00
jonas@perch.ndb.mysql.com
62fde95e08
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
2007-03-21 09:07:55 +01:00
jonas@perch.ndb.mysql.com
762ddadc24
Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-03-21 09:06:44 +01:00
jonas@perch.ndb.mysql.com
ec97b008f0
ndb - bug#27286
...
make sure master node is sendable, when getting ref::NotMaster
2007-03-21 08:47:54 +01:00
tomas@whalegate.ndb.mysql.com
38ac10df54
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-03-21 08:23:15 +01:00
tomas@whalegate.ndb.mysql.com
3ab996f18f
correct event buffer status reporting
2007-03-21 08:22:36 +01:00
tsmith@quadxeon.mysql.com
7018d9c5aa
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/51
2007-03-20 21:12:46 +01:00
kent@kent-amd64.(none)
a149769b2d
Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build
...
into mysql.com:/home/kent/bk/tmp/mysql-5.1-build
2007-03-20 17:58:30 +01:00
tomas@whalegate.ndb.mysql.com
3f16977b32
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-03-20 17:08:23 +01:00
tomas@whalegate.ndb.mysql.com
7bd5241cb4
enabled test case
...
+ some fixes to do the enable
2007-03-20 17:07:53 +01:00
jonas@perch.ndb.mysql.com
8c3751209c
Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-03-20 16:36:31 +01:00
jonas@perch.ndb.mysql.com
42b3e0a5af
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
2007-03-20 16:32:11 +01:00
tomas@whalegate.ndb.mysql.com
64b9bda21f
BUG#24363 If the table structure has been changed, the default action about the restore will fail.
...
- correction of patch, original patch will segfault for print option
2007-03-20 11:11:08 +01:00
tomas@poseidon.
0312d1bf91
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into poseidon.:/home/tomas/mysql-5.1-new-ndb
2007-03-20 08:57:34 +01:00
gni/root@dev3-221.dev.cn.tlan
61dd58beb3
BUG#21699 DROP last DATAFILE from TABLESPACE even though there are still table in it. And it gives the cofusing error message.
2007-03-20 10:36:20 +08:00
kostja@bodhi.local
bdb10baec1
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into bodhi.local:/opt/local/work/mysql-5.1-runtime
2007-03-20 00:42:11 +03:00
jonas@perch.ndb.mysql.com
229ee6d4f1
Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-03-19 14:55:13 +01:00
jonas@perch.ndb.mysql.com
886e11736b
ndb - test_event
...
Fix compile error with gcc4
2007-03-19 14:51:17 +01:00
jonas@perch.ndb.mysql.com
6856693904
Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-03-19 12:39:03 +01:00
jonas@perch.ndb.mysql.com
09e403aa9e
ndb - bug#20185
...
Fix race in testprg...causing random TC crashes
2007-03-19 12:31:23 +01:00
jonas@perch.ndb.mysql.com
582312fd34
Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-03-19 11:15:05 +01:00
jonas@perch.ndb.mysql.com
bdb70f7b43
ndb - autotest
...
increase some timeouts...
2007-03-19 11:13:10 +01:00
tomas@poseidon.
12fd06a6cb
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into poseidon.:/home/tomas/mysql-5.1-new-ndb
2007-03-19 10:54:47 +01:00
jonas@perch.ndb.mysql.com
40c3797ef0
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
2007-03-16 11:13:01 +01:00
jonas@perch.ndb.mysql.com
a8a220534c
Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-03-16 11:12:15 +01:00
jonas@perch.ndb.mysql.com
f161857d3e
ndb - bug#27203
...
Allow readTablePk to stumble on scan+deleted tuple,
reporting no-match instead of crash (in case scan is lock-owner)
2007-03-16 10:58:24 +01:00
kostja@bodhi.local
7d84ef0e11
Bug#26765 "typo when running mysql-test-run"
...
Fix a typo (togheter -> together)
2007-03-15 23:17:44 +03:00
hartmut@hartmut-desktop.buero.foebud.org
d2986bff2e
Merge hholzgraefe@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb
...
into mysql.com:/home/hartmut/projects/mysql/dev/bug-trees/mysql-5.1-bug25933
2007-03-15 13:52:25 +01:00
jonas@perch.ndb.mysql.com
85220e3940
Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-03-15 13:37:04 +01:00
hartmut@mysql.com/hartmut-desktop.buero.foebud.org
4c9f4a006f
added missing prototype implementations (bug #25933 )
2007-03-15 13:35:49 +01:00
jonas@perch.ndb.mysql.com
1bf8202fce
ndb - bug#27169
...
Fix bug in SUMA::resend_bucket which could cause mysqld to crash
2007-03-15 13:30:42 +01:00
jonas@perch.ndb.mysql.com
f8483eccc3
Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-03-15 11:06:57 +01:00
jonas@perch.ndb.mysql.com
1c203fcc04
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
2007-03-15 11:06:01 +01:00
jonas@perch.ndb.mysql.com
14de245543
Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-03-15 07:16:44 +01:00
jonas@perch.ndb.mysql.com
1fa2a64778
ndb -
...
fix test_event -n EventOperationApplier
2007-03-15 07:08:15 +01:00
jonas@perch.ndb.mysql.com
a7714519a7
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
2007-03-14 15:41:24 +01:00
jonas@perch.ndb.mysql.com
72bd367013
Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-03-14 15:40:06 +01:00
jonas@perch.ndb.mysql.com
3b21f00f87
ndb - bug#27005
...
Handle API failure during resend
API failure could cause release of table object, which will make resend crash
when dereferencing table object
Solution, use table_id+hash+schemaversion instead of *raw* pointer in resend
2007-03-14 15:37:47 +01:00
kent@kent-amd64.(none)
ac91a4a89f
Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build
...
into mysql.com:/home/kent/bk/tmp/mysql-5.1-build
2007-03-14 14:37:50 +01:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
1bcac85f04
Merge jhe@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj
2007-03-14 18:48:51 +08:00
jonas@perch.ndb.mysql.com
f2465cf677
Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-03-14 11:23:58 +01:00
jonas@perch.ndb.mysql.com
820901f928
ndb - bug#27087
...
Make sure not to handle API_FAILREQ if it's already handled
2007-03-14 11:22:11 +01:00