Commit graph

939 commits

Author SHA1 Message Date
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
pekka@clam.ndb.mysql.com
1f7b86bf83 ndb - bug#14935 : Correct error to TUX on node alloc fail. There is more bugs with db full. 2006-06-19 10:50:23 +02:00
evgen@moonbone.local
79c91f6214 Manually merged 2006-06-18 14:56:35 +04:00
pekka@clam.ndb.mysql.com
5d3aa23d2a ndb - bug#19285 post merge 5.0->5.1 fix (error codes) 2006-06-17 13:12:38 +02:00
pekka@clam.ndb.mysql.com
adc433484f Merge clam.ndb.mysql.com:/space/pekka/ndb/version/my50-bug19285
into  clam.ndb.mysql.com:/space/pekka/ndb/version/my51-bug19285
2006-06-17 13:05:31 +02:00
pekka@clam.ndb.mysql.com
95aa9c28f2 Merge clam.ndb.mysql.com:/space/pekka/ndb/version/my50-bug19285
into  clam.ndb.mysql.com:/space/pekka/ndb/version/my51-bug19285
2006-06-17 11:10:43 +02:00
petr@outpost.site
86f2f5828d Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1
into  mysql.com:/home/cps/mysql/devel/5.1-csv-remove-mmap
2006-06-16 23:39:09 +04:00
stewart@willster.(none)
0811fd79f1 Merge mysql.com:/home/stewart/Documents/MySQL/5.0/merge-queue
into  mysql.com:/home/stewart/Documents/MySQL/5.1/main
2006-06-16 20:52:21 +10:00
lars@mysql.com
5f37fc4a76 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
2006-06-16 01:15:19 +02:00
pekka@clam.ndb.mysql.com
47a2004431 Merge clam.ndb.mysql.com:/space/pekka/ndb/version/my50-bug18781
into  clam.ndb.mysql.com:/space/pekka/ndb/version/my51-bug18781
2006-06-15 14:49:48 +02:00
petr@mysql.com
cde3d7d886 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1
into  mysql.com:/home/cps/mysql/devel/5.1-csv-remove-mmap
2006-06-15 14:53:11 +04:00
aivanov@mysql.com
413a80d42b Post innodb-5.1-ss594 modifications.
Avoiding compilation error ("void * - unknown size").
2006-06-15 07:24:23 +04:00
aivanov@mysql.com
662dd8d967 Post innodb-5.1-ss594 modifications.
Avoiding build error caused by adding new files.
2006-06-15 05:43:19 +04:00
svoj@may.pils.ru
fe1f04c7c9 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-engines
into  may.pils.ru:/home/svoj/devel/mysql/BUG19580/mysql-5.1-new
2006-06-14 15:17:47 +05:00
tomas@poseidon.ndb.mysql.com
c30e79165b 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-14 04:41:49 +02:00
tomas@poseidon.ndb.mysql.com
764e4e5a9d correct initialization of event operation to enable early delete 2006-06-14 01:19:13 +02:00
cmiller@zippy.(none)
8e2aee1c01 Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new
2006-06-13 15:33:17 -04:00
stewart@mysql.com
53f760a05d BUG#17928 testBackup fails in error handling testcases
Reproduced failure of NFMaster on my laptop, this is the fix with some added
debug information to help people in the future when they trigger asserts in
AsyncFile (ndbfs helper threads).
2006-06-14 00:21:46 +10:00
pekka@orca.ndb.mysql.com
0685030416 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1
into  clam.ndb.mysql.com:/space/pekka/ndb/version/my51
2006-06-12 22:09:48 +02:00
pekka@clam.ndb.mysql.com
800e1e56a9 ndb - bug#19872 fix (sufficient for replication) 2006-06-12 18:00:06 +02:00
acurtis@xiphis.org
32fbbbb9b6 Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.1-engines
into  xiphis.org:/home/antony/work2/p2-bug20168.2
2006-06-12 06:53:31 -07:00
mskold@linux.site
40e6161fdd Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1
into  mysql.com:/home/marty/MySQL/mysql-5.1
2006-06-12 14:36:06 +02:00
mskold@mysql.com
38a445fee1 sql_delete.cc:
Bug #18864  TRUNCATE TABLE doesn't reset AUTO_INCREMENT value on ndb table: locked lock_OPEN mutex to support TRUNCATE with re-create and cluster binlog
Many files:
  Bug #18864  TRUNCATE TABLE doesn't reset AUTO_INCREMENT value on ndb table: adaption to MySQ Cluster replication
ndb_lock.result, ha_ndbcluster.cc:
  Fix for Bug #18184  SELECT ... FOR UPDATE does not work..: Adaption to 5.1 code
NdbDictionaryImpl.hpp:
  Fix of bad merge
2006-06-12 14:23:21 +02:00
tomas@poseidon.ndb.mysql.com
faa2f09107 Merge jonas@perch:src/51-jonas
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2006-06-12 13:46:10 +02:00
tomas@poseidon.ndb.mysql.com
cd90b5d777 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-12 13:29:33 +02:00
tomas@poseidon.ndb.mysql.com
cb3a75a4ee Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2006-06-12 13:12:03 +02:00
aivanov@mysql.com
53c9173e1b Making dtype_get_max_size() non-inline to avoid build error
in non-debug mode.
2006-06-12 13:52:29 +04:00
mskold@mysql.com
be60898441 Merge mysql.com:/home/marty/MySQL/mysql-5.0
into  mysql.com:/home/marty/MySQL/mysql-5.1
2006-06-12 11:34:00 +02:00
ingo@mysql.com
0ae24af51b Merge mysql.com:/home/mydev/mysql-5.1--main
into  mysql.com:/home/mydev/mysql-5.1-amerge
2006-06-09 13:51:41 +02:00
tomas@poseidon.ndb.mysql.com
6e68423db6 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2006-06-09 12:40:10 +02:00
tomas@poseidon.ndb.mysql.com
5af1d8de07 Bug #13266 Online adding of MySQLD causes cluster to crash
- check node type, if configuration has not bee updated, type will be undefined, and conenction will be refused
2006-06-09 12:30:04 +02:00
jonas@mc01.ndb.mysql.com
4a8dbd3f7b Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-jonas
into mc01.ndb.mysql.com:/space/jonas/mysql-5.1-jonas
2006-06-09 11:40:38 +02:00
jonas@mc01.ndb.mysql.com
9064f067e8 ndb - fix 5.1 scan error handling problem
Make sure that error gets set corretly also
    when error code directly after taking mutex
2006-06-09 11:39:27 +02:00
jonas@perch.ndb.mysql.com
e576b2460b ndb - testframework
impl. ugly flag to skip dict cache invalidation as it break all testSystemRestart testcases
2006-06-09 08:22:50 +02:00
jonas@mc01.ndb.mysql.com
b7ce47b28e Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-jonas
into mc01.ndb.mysql.com:/space/jonas/mysql-5.1-jonas
2006-06-08 16:33:17 +02:00
jonas@mc01.ndb.mysql.com
20903f8e49 merge 2006-06-08 16:11:55 +02:00
jonas@perch.ndb.mysql.com
25dc68e9f9 ndb - hugo
Print (and optionally specify) random seed
2006-06-08 15:43:41 +02:00
jonas@mc01.ndb.mysql.com
340e5ce138 ndb - bug#20334
fix bug in tup scan wrt LCP
2006-06-08 12:41:06 +02:00
jonas@mc01.ndb.mysql.com
2b82420a6c ndb -
fix release compile error
2006-06-07 16:02:37 +02:00