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 |
|
jonas@perch.ndb.mysql.com
|
2f22f5aa21
|
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
|
2006-07-04 09:38:46 +02:00 |
|
jonas@perch.ndb.mysql.com
|
05f14b144b
|
Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
|
2006-06-30 11:26:47 +02:00 |
|
jonas@perch.ndb.mysql.com
|
75c9f3cd01
|
Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
|
2006-06-30 11:26:10 +02:00 |
|
jonas@perch.ndb.mysql.com
|
2711af699c
|
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-06-30 11:19:55 +02:00 |
|
jonas@perch.ndb.mysql.com
|
bc621b6418
|
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
|
2006-06-30 11:18:31 +02:00 |
|
jonas@perch.ndb.mysql.com
|
8e11f6f508
|
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into perch.ndb.mysql.com:/home/jonas/src/51-work
|
2006-06-30 10:31:43 +02:00 |
|
jonas@perch.ndb.mysql.com
|
a4bfd31865
|
Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into perch.ndb.mysql.com:/home/jonas/src/50-work
|
2006-06-30 09:42:15 +02:00 |
|
jonas@perch.ndb.mysql.com
|
ab3992771b
|
ndb - bug#20774
crash if system restart with more than 4096 fragments
solution: continueb enable expand check loop
|
2006-06-30 09:41:41 +02:00 |
|
petr@owlet.
|
b655968123
|
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/home/cps/mysql/trees/5.1-team
|
2006-06-30 11:17:53 +04:00 |
|
petr@mysql.com
|
c95ad6158a
|
cleanup
|
2006-06-30 08:11:51 +04:00 |
|
petr@mysql.com
|
157cc569a8
|
fix test failures
|
2006-06-30 03:28:58 +04:00 |
|
monty@hasky.mysql.fi
|
0b00ae6bc5
|
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/home/my/mysql-5.1
|
2006-06-29 23:41:33 +03:00 |
|
monty@mysql.com
|
8eb9c06d70
|
Replaced assert with argument checking, as rpl_ndb_UUID caused slave to fail on x86 64 bit
(It failed even if test was marked as skipped)
|
2006-06-29 23:22:55 +03:00 |
|
tomas@poseidon.ndb.mysql.com
|
3b3dde6f4e
|
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
|
2006-06-29 22:13:19 +02:00 |
|
tomas@poseidon.ndb.mysql.com
|
5d67b05203
|
corrected merge error
|
2006-06-29 22:11:29 +02:00 |
|
tomas@poseidon.ndb.mysql.com
|
9d902d4cf8
|
manual merge
|
2006-06-29 21:25:37 +02:00 |
|
tomas@poseidon.ndb.mysql.com
|
6fb6a1058c
|
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
|
2006-06-29 21:14:29 +02:00 |
|
tomas@poseidon.ndb.mysql.com
|
6f318d1658
|
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
|
2006-06-29 21:05:43 +02:00 |
|
tomas@poseidon.ndb.mysql.com
|
87460ec76a
|
Bug #19202 Incorrect errorhandling in select count(*) wrt temporary error
|
2006-06-29 20:55:21 +02:00 |
|
petr@owlet.
|
35b7eb7e22
|
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into mysql.com:/home/cps/mysql/trees/5.1-team
|
2006-06-29 21:48:53 +04:00 |
|
petr@mysql.com
|
4d76c28caa
|
Fix Bug#20692 rpl_* tests failure on hpux
|
2006-06-29 21:43:52 +04:00 |
|
tomas@poseidon.ndb.mysql.com
|
42dfb7a88d
|
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
|
2006-06-29 17:26:22 +02:00 |
|
jonas@perch.ndb.mysql.com
|
ba1541c914
|
Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
|
2006-06-29 16:32:51 +02:00 |
|
jonas@perch.ndb.mysql.com
|
d7649bac06
|
Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
|
2006-06-29 16:32:23 +02:00 |
|
jonas@perch.ndb.mysql.com
|
52e248a7d7
|
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into perch.ndb.mysql.com:/home/jonas/src/51-work
|
2006-06-29 16:23:38 +02:00 |
|
jonas@perch.ndb.mysql.com
|
a45f572dc8
|
Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into perch.ndb.mysql.com:/home/jonas/src/50-work
|
2006-06-29 16:22:20 +02:00 |
|
jonas@perch.ndb.mysql.com
|
f4a095a399
|
ndb - autotest
Fix testNodeRestart -n DuringLCP and others (add stopTest() at end of test :-))
|
2006-06-29 16:20:18 +02:00 |
|
stewart@willster.(none)
|
c3010c2497
|
Merge mysql.com:/home/stewart/Documents/MySQL/5.1/bug17928
into mysql.com:/home/stewart/Documents/MySQL/5.1/ndb
|
2006-06-29 22:36:27 +10:00 |
|
lars@dl145k.mysql.com
|
f3d8d60259
|
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
|
2006-06-29 14:24:02 +02:00 |
|
tomas@poseidon.ndb.mysql.com
|
019532a544
|
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
|
2006-06-29 13:26:39 +02:00 |
|
tomas@poseidon.ndb.mysql.com
|
0822e24679
|
fixed too small requestInfo in signal
+ adopted signal to be as close as possible to 5.1...
|
2006-06-29 13:01:54 +02:00 |
|
tomas@poseidon.ndb.mysql.com
|
0d22cc662b
|
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
|
2006-06-29 10:48:31 +02:00 |
|
monty@mysql.com
|
3f22bc07c6
|
Fixed failing test rpl_ndb_auto_inc.test
Mark events_stress.test as 'big' as it's very slow on some machines
|
2006-06-29 03:24:33 +03:00 |
|
monty@narttu.mysql.fi
|
7b0f8635ae
|
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/home/my/mysql-5.1
|
2006-06-29 00:09:53 +03:00 |
|
evgen@moonbone.local
|
3ad6ad75e1
|
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1
into moonbone.local:/home/evgen/mysql-5.1-new
|
2006-06-28 21:51:19 +04:00 |
|
monty@narttu.mysql.fi
|
91c3e28d77
|
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/home/my/mysql-5.1
|
2006-06-28 20:03:46 +03:00 |
|
acurtis@ltamd64.xiphis.org
|
9d99e180f5
|
Merge xiphis.org:/home/antony/work2/p4-bug12096.3
into xiphis.org:/home/antony/work2/p4-bug12096.3-merge
|
2006-06-28 10:02:47 -07:00 |
|
evgen@moonbone.local
|
82369c4e65
|
Manual merge
|
2006-06-28 19:34:04 +04:00 |
|
tomas@poseidon.ndb.mysql.com
|
470087cb58
|
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
|
2006-06-28 17:20:01 +02:00 |
|
tomas@poseidon.ndb.mysql.com
|
63c72dc02b
|
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
|
2006-06-28 17:12:18 +02:00 |
|
lars@dl145k.mysql.com
|
315ae8f4cc
|
Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
|
2006-06-28 16:56:15 +02:00 |
|
lars@dl145k.mysql.com
|
d4f7943594
|
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
|
2006-06-28 16:44:54 +02:00 |
|
monty@mysql.com
|
500dd048b9
|
Added -DHAVE_MUTEX_THREAD_ONLY to fix that bdb doesn't crash with "unable to initialize mutex"
|
2006-06-28 17:23:54 +03:00 |
|
lars@mysql.com
|
6036c30b57
|
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
|
2006-06-28 16:18:57 +02:00 |
|
lars@dl145k.mysql.com
|
00fc05ff1b
|
Merge mysql.com:/users/lthalmann/bk/mysql-5.0-rpl
into mysql.com:/users/lthalmann/bk/mysql-5.1-new-rpl
|
2006-06-28 15:34:09 +02:00 |
|
lars@mysql.com
|
c75584d8d9
|
Merge mysql.com:/users/lthalmann/bk/mysql-5.0-rpl
into mysql.com:/users/lthalmann/bk/mysql-5.1-new-rpl
|
2006-06-28 15:27:25 +02:00 |
|
knielsen@mysql.com
|
10abc3e244
|
BUG#20739.
In the Windows build files, the "Max nt" configuration for some reason
had the mysql_client_test project disabled. Enable it.
|
2006-06-28 15:15:49 +02:00 |
|
lars@mysql.com
|
38501d8804
|
Disabled test case for Windows (BUG#20753)
|
2006-06-28 15:07:41 +02:00 |
|