Commit graph

44196 commits

Author SHA1 Message Date
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
kostja@bodhi.local
f017117d84 Update the result file with an updated comment. 2007-03-22 00:11:58 +03:00
kostja@bodhi.local
9279170e69 Merge bodhi.local:/opt/local/work/mysql-5.0-runtime
into  bodhi.local:/opt/local/work/mysql-5.1-runtime
2007-03-22 00:11:11 +03:00
kostja@bodhi.local
54076b30d0 Try to fix events_logs_tests race on Windows. 2007-03-22 00:09:50 +03:00
kostja@bodhi.local
95597c8371 Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  bodhi.local:/opt/local/work/mysql-5.1-runtime
2007-03-21 23:59:37 +03:00
kostja@bodhi.local
c011a25f66 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  bodhi.local:/opt/local/work/mysql-5.0-runtime
2007-03-21 23:57:12 +03:00
kostja@bodhi.local
102f298a6f Fix warnings on Windows. 2007-03-21 20:32:15 +03:00
kostja@bodhi.local
39eafdd853 Fix a broken merge. 2007-03-21 19:20:44 +03: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
jonas@perch.ndb.mysql.com
b950160a46 ndb - bug#27283
Additional fix for 2-node case
2007-03-21 15:34:47 +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
tomas@whalegate.ndb.mysql.com
75c41e17b9 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-03-21 09:27:13 +01:00
tomas@whalegate.ndb.mysql.com
ca118237bb 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 09:26:05 +01:00
tomas@whalegate.ndb.mysql.com
585782e084 Bug #26825 MySQL Server Crashes in high load
- initialize to NULL, to avoid call of free on uninitialized variable
2007-03-21 09:23:49 +01:00
tomas@whalegate.ndb.mysql.com
ba74604c56 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca
2007-03-21 09:08:05 +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
tomas@whalegate.ndb.mysql.com
37b8c96197 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2007-03-21 09:00:38 +01:00
jonas@perch.ndb.mysql.com
b996817294 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
2007-03-21 08:59:57 +01:00
jonas@perch.ndb.mysql.com
7834bd5846 ndb - bug#27286 (5.0 version)
make sure master is sendable
2007-03-21 08:57:14 +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
5682efdfcf Bug #26825 MySQL Server Crashes in high load
- initialize to NULL, to avoid call of free on uninitialized variable
2007-03-21 08:40:24 +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
tomas@whalegate.ndb.mysql.com
ffb35b80fe minor fix of ndb cluster startup script 2007-03-21 08:02:11 +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
jonas@perch.ndb.mysql.com
844845c772 ndb - bug#27283 (wl2325-5.0)
Handle race condtition between MASTER_GCPCONF and execGCP_NODEFINISH
2007-03-20 16:16:25 +01:00
jonas@perch.ndb.mysql.com
7898079378 ndb - bug#27291
Fix correct min-value for LockPagesInMemory
2007-03-20 16:08:39 +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@whalegate.ndb.mysql.com
36e3a94bf8 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-03-20 10:47:56 +01:00
tomas@whalegate.ndb.mysql.com
ac8592ce2c Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2007-03-20 10:37:11 +01:00
tomas@whalegate.ndb.mysql.com
07d1f742f9 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 10:25:55 +01:00
tomas@whalegate.ndb.mysql.com
c3993eceb4 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-20 08:49:29 +01:00
ibabaev@bk-internal.mysql.com
45fb6c90f0 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-opt
2007-03-20 03:59:32 +01:00
evgen@moonbone.local
41c732493e sql_insert.cc:
After merge fix.
2007-03-20 01:37:33 +03:00
evgen@moonbone.local
37add3b661 Merge moonbone.local:/mnt/gentoo64/work/27006-bug-5.0-opt-mysql
into  moonbone.local:/mnt/gentoo64/work/test-5.1-opt-mysql
2007-03-20 01:29:09 +03:00
evgen@moonbone.local
31b9145ab3 sql_insert.cc:
Removed wrong fix for the bug#27006.
  The bug was added by the fix for the bug#19978 and fixed by Monty on 2007/02/21.
trigger.test, trigger.result:
  Corrected test case for the bug#27006.
2007-03-20 00:46:19 +03:00
kostja@bodhi.local
3ef6094884 Merge bodhi.local:/opt/local/work/mysql-5.0-runtime
into  bodhi.local:/opt/local/work/mysql-5.1-runtime
2007-03-20 00:44:25 +03: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
kostja@bodhi.local
a9065201d5 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  bodhi.local:/opt/local/work/mysql-5.0-runtime
2007-03-19 23:59:53 +03:00
jonas@perch.ndb.mysql.com
925f06e511 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-19 18:30:06 +01: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
tomas@whalegate.ndb.mysql.com
571c869e12 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-19 12:58: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