Commit graph

1032 commits

Author SHA1 Message Date
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
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
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
stewart@willster.(none)
c19578fbfd Merge mysql.com:/home/stewart/Documents/MySQL/5.1/ndb
into  mysql.com:/home/stewart/Documents/MySQL/5.1/merge
2006-06-28 22:16:04 +10:00
stewart@willster.(none)
e5567d8402 Merge mysql.com:/home/stewart/Documents/MySQL/5.0/merge
into  mysql.com:/home/stewart/Documents/MySQL/5.1/merge
2006-06-28 22:06:26 +10:00
jonas@perch.ndb.mysql.com
f54b1e0dcf ndb -
50->51 merge of bug#20442, force close scan (with locks)
2006-06-28 12:16:10 +02:00
jonas@perch.ndb.mysql.com
ff2528f3c0 ndb -
ndbapi test of bug#20252
2006-06-28 11:38:22 +02:00
jonas@perch.ndb.mysql.com
7f30766001 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-work
2006-06-28 11:32:29 +02:00
jonas@perch.ndb.mysql.com
b26e651f98 Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-06-28 08:47:43 +02:00
tomas@poseidon.ndb.mysql.com
9bc0c99aca Bug #19852 Restoring backup made from cluster with full data memory fails
- post merge fixes for 5.1
2006-06-27 13:40:33 +02:00
tomas@poseidon.ndb.mysql.com
49c8863bbf Bug #19852 Restoring backup made from cluster with full data memory fails
- post merge fixes for 5.1
2006-06-27 13:12:34 +02:00
jonas@perch.ndb.mysql.com
552d53bb88 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-work
2006-06-27 11:46:02 +02:00
tomas@poseidon.ndb.mysql.com
f923d6395d Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2006-06-27 11:22:42 +02:00
jonas@perch.ndb.mysql.com
33339fdf40 ndb - bug#20053
make sure we can only drop files from correct file group
2006-06-26 15:08:09 +02:00
jonas@perch.ndb.mysql.com
e9cbae32ea ndb - bug#20683
part 2 - handle safecounter.init() failing in all parts of event code
2006-06-26 12:31:09 +02:00
jonas@perch.ndb.mysql.com
874607884b Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-work
2006-06-26 12:19:29 +02:00
jonas@perch.ndb.mysql.com
50b8eb8538 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-06-26 10:02:03 +02:00
monty@hasky.mysql.fi
14e05051f1 Merge monty@192.168.0.9:/my/mysql-5.1
into  mysql.com:/home/my/mysql-5.1
2006-06-23 03:04:13 +03:00
monty@mysql.com
4697deb436 Remove compiler warnings
Fixed wrong table flags type in ndbcluster that caused previous commit to fail
2006-06-23 02:49:19 +03:00
monty@hasky.mysql.fi
9305db78f2 Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  mysql.com:/home/my/mysql-5.1
2006-06-22 23:01:01 +03:00
pekka@orca.ndb.mysql.com
7524881b50 Merge clam.ndb.mysql.com:/space/pekka/ndb/version/my51
into  clam.ndb.mysql.com:/space/pekka/ndb/version/my51-bug14935
2006-06-22 21:22:46 +02:00
pekka@orca.ndb.mysql.com
09e8039aa4 Merge clam.ndb.mysql.com:/space/pekka/ndb/version/my51
into  clam.ndb.mysql.com:/space/pekka/ndb/version/my51-bug18781
2006-06-22 19:48:04 +02:00
pekka@clam.ndb.mysql.com
ac622fee7f ndb - bug#18781 post-merge 5.0->5.1 fixes (one more to come)
have to push this to be able to push 5.0
2006-06-22 19:26:15 +02:00
jonas@perch.ndb.mysql.com
ecedd8c608 ndb - bug#18782
crash correct node in case of START_FRAGREF
2006-06-22 15:16:33 +02:00
jonas@perch.ndb.mysql.com
bbbb156efb ndb - bug#20008
no DD when diskless
2006-06-22 14:57:43 +02:00
monty@mysql.com
b8ab496057 Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  mysql.com:/home/my/mysql-5.1
2006-06-22 12:21:41 +03:00
jonas@perch.ndb.mysql.com
f618c9ed8f 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-22 10:52:45 +02:00
jonas@perch.ndb.mysql.com
dc75269965 ndb - bug#16341
create tablespace/logfile group should "back out changes"
2006-06-22 10:24:44 +02:00
pekka@orca.ndb.mysql.com
43409d98fe Merge clam.ndb.mysql.com:/space/pekka/ndb/version/my51
into  clam.ndb.mysql.com:/space/pekka/ndb/version/my51-bug18102
2006-06-21 17:19:59 +02:00
pekka@clam.ndb.mysql.com
7f9bfc2058 ndb - add test_event_merge to daily-devel-tests.txt 2006-06-21 17:17:12 +02:00
pekka@clam.ndb.mysql.com
6ba2b1845c ndb - bug#18102: fixes on NDB API level 2006-06-21 16:15:04 +02:00
jonas@perch.ndb.mysql.com
8e198f577f 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-21 16:03:10 +02:00
jonas@perch.ndb.mysql.com
a32d815a25 ndb - bug#19275
make sure tablename is release in case of alter table
2006-06-21 16:01:23 +02:00
jonas@perch.ndb.mysql.com
e166a5e6be 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-21 14:36:50 +02:00
lars@dl145j.mysql.com
ed0e98529c Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
2006-06-21 13:51:28 +02:00
jonas@perch.ndb.mysql.com
14ba65ff64 ndb - bug#20007
varpages did not get freed on drop table
2006-06-21 13:39:04 +02:00
monty@narttu.mysql.fi
20c00662eb Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  mysql.com:/home/my/mysql-5.1
2006-06-21 13:24:56 +03:00
tomas@poseidon.ndb.mysql.com
f072f7cbb5 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-21 08:49:40 +02:00
tomas@poseidon.ndb.mysql.com
0865a5da9b Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2006-06-20 19:33:25 +02:00
tomas@poseidon.ndb.mysql.com
7be42667f0 Bug #17297 Fix error messages 2006-06-20 19:17:07 +02:00
tomas@poseidon.ndb.mysql.com
0f55e30fa8 Bug #19543 Out REDO log on subscription creation during startup, missing error message
- add error message
2006-06-20 15:45:17 +02:00
kent@mysql.com
8f0aa436ed Merge 2006-06-20 11:11:18 +02:00
stewart@mysql.com
9edd7b3766 Merge mysql.com:/home/stewart/Documents/MySQL/5.0/bugsmerge
into  mysql.com:/home/stewart/Documents/MySQL/5.1/main
2006-06-20 17:33:14 +10:00
svoj@may.pils.ru
6124539b0f Merge april:devel/BitKeeper/mysql-5.1-engines
into  may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-5.1
2006-06-19 19:57:42 +05:00
lars@dl145j.mysql.com
9bf46d4844 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
2006-06-19 12:14:38 +02:00
monty@mysql.com
49a3334889 Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  mysql.com:/home/my/mysql-5.1
2006-06-19 13:00:36 +03:00
monty@mysql.com
860661a2dc unsigned char -> uchar
Added missing copyright
Indentation and prototype fixes
Fixed compiler warning
2006-06-19 12:45:34 +03:00