Commit graph

43117 commits

Author SHA1 Message Date
tomas@poseidon.mysql.com
d0d1eb770c Merge mysqldev@production.mysql.com:/data0/mysqldev/my/build-200702202011-5.1.16-beta/mysql-5.1-release
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-02-21 14:31:17 +07:00
tomas@poseidon.mysql.com
dd3239821f fix c++ syntac in c file 2007-02-21 14:26:47 +07:00
tomas@poseidon.mysql.com
6cbc6d91f9 Bug #26490 duplicate cluster error code
- fixed error code
- added test program run in mysql-test-run bk version
2007-02-21 11:41:22 +07:00
istruewing@chilla.local
e9d7098082 Merge chilla.local:/home/mydev/mysql-5.0-axmrg
into  chilla.local:/home/mydev/mysql-5.1-axmrg
2007-02-20 10:05:22 +01:00
istruewing@chilla.local
0f4a84f002 Fixed a bad merge. Got a duplicate symbol on OSX. 2007-02-20 10:01:54 +01:00
knielsen@ymer.(none)
6db8fef5d3 A few minor cleanups for recent AbortOption behaviour change. 2007-02-20 09:52:18 +01:00
jonas@perch.ndb.mysql.com
5d37bbee56 Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-02-20 01:00:18 +01:00
jonas@perch.ndb.mysql.com
1d99e609ed Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-work
2007-02-20 00:58:25 +01:00
jonas@perch.ndb.mysql.com
8801e8e7af fix compile error in testBitfield 2007-02-20 00:55:33 +01:00
jonas@perch.ndb.mysql.com
9bc3503489 Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-02-19 22:56:15 +01:00
jonas@perch.ndb.mysql.com
f2e2e7a6e7 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-work
2007-02-19 22:53:17 +01:00
jonas@perch.ndb.mysql.com
a51d58e641 ndb - fix correct argv/argc handling in testBitfield 2007-02-19 22:51:04 +01:00
jonas@perch.ndb.mysql.com
f0253235b8 ndb -
forgott to add testcase for bug#26481
2007-02-19 22:30:54 +01:00
jonas@perch.ndb.mysql.com
e882e4f674 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-02-19 21:40:34 +01:00
jonas@perch.ndb.mysql.com
6c54eccda2 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
2007-02-19 21:19:21 +01:00
jonas@perch.ndb.mysql.com
f6dd9362ce 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-02-19 20:52:40 +01:00
jonas@perch.ndb.mysql.com
20c8b292e7 Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-02-19 20:34:48 +01:00
jonas@perch.ndb.mysql.com
1cfd066e90 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-work
2007-02-19 20:21:28 +01:00
jonas@perch.ndb.mysql.com
4c3fef3ae8 ndb - bug#26481
fix for killed node during initial node restart
2007-02-19 20:13:08 +01:00
tomas@poseidon.mysql.com
c0a2c118c9 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-02-19 11:27:04 +07:00
jonas@perch.ndb.mysql.com
44fa3eaaf6 Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-02-18 00:23:08 +01:00
jonas@perch.ndb.mysql.com
4d80c3f639 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-work
2007-02-17 23:57:09 +01:00
jonas@perch.ndb.mysql.com
2cff674c1d ndb - bug#26457
master failure during master take over
2007-02-17 23:52:17 +01:00
tomas@poseidon.mysql.com
53cc4c3385 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-02-17 16:12:25 +07:00
jonas@perch.ndb.mysql.com
44f1c6249b Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-02-16 21:44:39 +01:00
jonas@eel.(none)
f65af74adc Merge localhost:/home/jonas/src/51-work
into  eel.(none):/home/jonas/src/51-work
2007-02-16 21:39:20 +01:00
jonas@eel.(none)
c46900c1a9 ndb - atrt minor fixes 2007-02-16 21:09:38 +01:00
jonas@perch.ndb.mysql.com
05f90ebc7e 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-02-16 18:27:08 +01:00
jonas@perch.ndb.mysql.com
10153653b2 Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-02-16 18:25:10 +01:00
jonas@perch.ndb.mysql.com
3d04728eea Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-work
2007-02-16 18:23:54 +01:00
jonas@perch.ndb.mysql.com
80b82d2bbd ndb - bug in my.cnf handling on resize of vector
backport fix from 5.1
2007-02-16 18:20:24 +01:00
jonas@perch.ndb.mysql.com
62e52c4998 Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-02-16 18:16:22 +01:00
jonas@perch.ndb.mysql.com
d1026838f5 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-work
2007-02-16 18:14:41 +01:00
jonas@perch.ndb.mysql.com
77b8feb878 ndb - bug#26454
make lockpages=1 run a bit earlier in startup
2007-02-16 18:10:27 +01:00
istruewing@chilla.local
db692e7f63 Merge chilla.local:/home/mydev/mysql-5.0-axmrg
into  chilla.local:/home/mydev/mysql-5.1-axmrg
2007-02-16 12:07:01 +01:00
istruewing@chilla.local
e266bc29a4 Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  chilla.local:/home/mydev/mysql-5.1-axmrg
2007-02-16 12:05:57 +01:00
istruewing@chilla.local
97c6a6c4e8 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  chilla.local:/home/mydev/mysql-5.0-axmrg
2007-02-16 10:39:45 +01:00
tomas@poseidon.mysql.com
a25431a9cb 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-02-16 16:16:28 +07:00
jonas@perch.ndb.mysql.com
80fe0fe445 Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-02-16 01:53:29 +01:00
jonas@eel.(none)
685423e587 ndb - autotest
increase timeout on slow test
2007-02-16 01:40:50 +01:00
jonas@eel.(none)
b030cc5516 ndb autotest -
Fix testcase so that it does not leak tables...causing subsequent errors
2007-02-16 01:36:22 +01:00
jonas@perch.ndb.mysql.com
af1e269165 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-02-15 23:17:51 +01:00
jonas@perch.ndb.mysql.com
f7ea83d6e5 Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-02-15 23:15:40 +01:00
jonas@eel.(none)
b95714e138 ndb - new atrt
Fix bug when restarting cluster after failure
      (fs was not cleared)
    Fix cosmetic bug that made rsync be run several times when gathering result
2007-02-15 23:10:32 +01:00
jonas@eel.(none)
1d54870364 ndb -
fix ao_ignore behavior change in hugo
  (affecting testOperations & testTransactions)
2007-02-15 18:39:17 +01:00
joerg@trift2.
846e078fbb Merge trift2.:/MySQL/M51/mysql-5.1
into  trift2.:/MySQL/M51/push-5.1
2007-02-15 13:06:42 +01:00
tomas@poseidon.mysql.com
d36db96c8b Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-02-15 14:09:18 +07:00
tomas@poseidon.mysql.com
7da5b1ecba 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-02-15 00:21:46 +07:00
cmiller@zippy.cornsilk.net
757267b140 Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2007-02-14 10:48:30 -05:00
cmiller@zippy.cornsilk.net
154f7f396e Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2007-02-14 10:47:39 -05:00