Commit graph

938 commits

Author SHA1 Message Date
tomas@poseidon.ndb.mysql.com
f822477297 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-ndb
2006-07-05 20:31:32 +02:00
tomas@poseidon.ndb.mysql.com
4f2becc9d3 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-ndb
2006-07-05 20:23:23 +02:00
pekka@clam.ndb.mysql.com
38d63c303a ndb - ndb api : try to catch autoincr 'error 0' 2006-07-05 17:36:19 +02:00
tomas@poseidon.ndb.mysql.com
1b7da4b8ed extra logging and asserts to try to track down the spurious completeCluster failure assetion
corrected error in invalidation of dict cache which may be causing the valgrind warning at times
2006-07-05 14:20:14 +02:00
tomas@poseidon.ndb.mysql.com
0a75f5fe0a Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-ndb
2006-07-05 01:56:38 +02:00
tomas@poseidon.ndb.mysql.com
980852eed3 Bug #20742 Assertion in drop of ndb binlog events after node restart 2006-07-04 17:58:20 +02:00
tomas@poseidon.ndb.mysql.com
6512316c3a Bug #20742 Assertion in drop of ndb binlog events after node restart
- make sure TE_ACTIVE event comes when node restarts so that ref counting is correct for drop of event
2006-07-04 17:37:44 +02:00
mskold@linux.site
9509145a9d Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1
into  mysql.com:/home/marty/MySQL/mysql-5.1-extra
2006-07-04 12:57:24 +02:00
tomas@poseidon.ndb.mysql.com
8a2694e25f Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2006-07-04 11:21:19 +02:00
mskold@linux.site
f5fb7ef27a Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1
into  mysql.com:/home/marty/MySQL/mysql-5.1-extra
2006-07-04 09:17:32 +02:00
mskold@mysql.com
59d69f6d38 Fix for Bug #18413 Data usage for varsize columns are not correctly reported to mysqld 2006-07-03 17:09:32 +02:00
pekka@clam.ndb.mysql.com
ea794df45a ndb - bug#20751 : report also composite op in merge 2006-07-03 12:13:57 +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
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
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