Commit graph

34928 commits

Author SHA1 Message Date
serg@serg.mylan
7549dac044 Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into serg.mylan:/usr/home/serg/Abk/m51
2006-06-14 19:46:52 +02:00
joerg@trift2.
9b79108e96 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/M51/bug18810-5.1
2006-06-14 18:20:33 +02:00
joerg@trift2.
075bb7faf2 Merge mysql.com:/M50/bug18810-5.0 into mysql.com:/M51/bug18810-5.1 2006-06-14 18:16:35 +02:00
joerg@mysql.com
6448fca67a Merge mysql.com:/M41/bug18810-4.1 into mysql.com:/M50/bug18810-5.0 2006-06-14 18:13:36 +02:00
joerg@mysql.com
054cc44ede support-files/mysql.server.sh : Fix the startup sequence. bug#18810 + bug#20118 2006-06-14 16:54:54 +02:00
mskold@mysql.com
61788c74da Fixed variable description 2006-06-14 14:13:45 +02:00
serg@serg.mylan
90e3ff1eb5 Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into serg.mylan:/usr/home/serg/Abk/m51
2006-06-14 13:57:17 +02:00
mskold@linux.site
c70ed99f48 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1
into  mysql.com:/home/marty/MySQL/mysql-5.1
2006-06-14 13:45:30 +02:00
svoj@may.pils.ru
5d4b5deae1 After merge fix. 2006-06-14 16:45:29 +05:00
svoj@may.pils.ru
64bcd2cc11 Merge may.pils.ru:/home/svoj/devel/mysql/merge/mysql-5.0-merge
into  may.pils.ru:/home/svoj/devel/mysql/merge/mysql-5.1
2006-06-14 16:45:28 +05:00
mskold@linux.site
274a23a95c Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1
into  mysql.com:/home/marty/MySQL/mysql-5.1
2006-06-14 13:45:27 +02:00
msvensson@neptunus.(none)
4ec47c9c73 Merge neptunus.(none):/home/msvensson/mysql/tmp/tmp_merge
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-06-14 13:45:27 +02:00
tomas@poseidon.ndb.mysql.com
0ecea73c32 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 13:45:26 +02:00
tomas@poseidon.ndb.mysql.com
2f6a4ad3c2 corrected merge error 2006-06-14 13:32:29 +02:00
tomas@poseidon.ndb.mysql.com
8af1a075a6 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2006-06-14 13:10:12 +02:00
tomas@poseidon.ndb.mysql.com
88373a025a Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2006-06-14 13:00:15 +02:00
tomas@poseidon.ndb.mysql.com
7e2323ed7e Bug repeated create, insert, drop can cause MySQL table definition cache to
corrupt
  - add infinite retry on drop table temporary error
2006-06-14 12:54:28 +02:00
tomas@poseidon.ndb.mysql.com
7f026f3afc 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 12:23:30 +02:00
tomas@poseidon.ndb.mysql.com
bdc7a1b759 Bug repeated create, insert, drop can cause MySQL table definition cache to corrupt
- add infinite retry on drop table temporary error
2006-06-14 12:21:18 +02:00
mskold@mysql.com
5660fa6b46 Added flag to detect renaming of fields (not supported as fast alter table for ndbcluster): psot review comment: cleared flag before checking 2006-06-14 12:01:06 +02:00
mskold@mysql.com
de28afe25b Added flag to detect renaming of fields (not supported as fast alter table for ndbcluster): added test case 2006-06-14 11:38:55 +02:00
mskold@mysql.com
a6ebed7cea Added flag to detect renaming of fields (not supported as fast alter table for ndbcluster) 2006-06-14 11:08:36 +02:00
gluh@eagle.intranet.mysql.r18.ru
0a141d6db3 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/home/gluh/MySQL/Merge/5.1
2006-06-14 13:53:30 +05:00
gluh@eagle.intranet.mysql.r18.ru
00a1b6857a after merege fix 2006-06-14 13:52:16 +05:00
msvensson@neptunus.(none)
644bbd6725 Update test result to 5.1 format 2006-06-14 10:23:08 +02:00
serg@serg.mylan
ebd20550f6 move --disable_warnings where it belongs 2006-06-14 10:04:30 +02:00
serg@serg.mylan
2d8f78e402 Bug#14708: Inconsistent treatment of NULLs in LEFT JOINed FULLTEXT matching without index
Don't rely on table->null_row when no index is used - it may be a multi-table
2006-06-14 09:19:02 +02:00
serg@serg.mylan
25d0962cbe change test targets to be more modular. include unit tests into make test 2006-06-14 09:12:37 +02:00
gluh@mysql.com
a1020c6e4d post-merge fix 2006-06-14 10:54:56 +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
mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se
02c25f8055 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1
into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19307
2006-06-13 22:41:48 -04:00
mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se
05703aea88 BUG#19307:
Removed non-static test case
2006-06-13 22:40:05 -04:00
mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se
6d519a2370 Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1
into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19307
2006-06-13 21:41:02 -04:00
tomas@poseidon.ndb.mysql.com
2d33bb5c94 ndb: add missing LOCK_open 2006-06-14 01:20:39 +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)
00243ac847 Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_merge
into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new
2006-06-13 16:06:35 -04: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
mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se
59c0034061 BUG#19307: CSV engine can cause crashes in partitioned tables (due to its conversion of NULLs to 0) 2006-06-13 14:36:23 -04:00
mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se
d2b04770ac Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1
into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19305
2006-06-13 11:44:43 -04:00
mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se
c2f0bd70b5 fixed test case 2006-06-13 11:32:07 -04:00
mskold@mysql.com
95d61f64d8 Fixed incorrect handling of renamed fields, forcing copy of table if needed and added optional system variable ndb_use_copying_alter_table 2006-06-13 16:44:30 +02:00
mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se
192033c7a2 Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19122
into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19305
2006-06-12 17:49:38 -04:00
mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se
44076b96a1 Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1
into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19122
2006-06-12 17:41:05 -04:00
mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se
92dec44ef9 BUG#19122: Need to close handlers before drop/rename phase
Fixed comments
2006-06-12 17:37:32 -04:00
mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se
30817b8900 BUG#19122: Need to close all handlers before rename/drop phase in ALTER TABLE ADD/DROP/REORGANIZE partitions
After review fix
2006-06-12 17:30:32 -04: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
mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se
334a28f9f5 Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19695
into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19305
2006-06-12 14:50:46 -04:00
mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se
744bb5d7bb Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1
into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19695
2006-06-12 14:42:07 -04:00
mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se
9aa3af6723 Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1
into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19305
2006-06-12 14:31:25 -04:00
pekka@clam.ndb.mysql.com
800e1e56a9 ndb - bug#19872 fix (sufficient for replication) 2006-06-12 18:00:06 +02:00