Commit graph

31926 commits

Author SHA1 Message Date
jonas@perch.ndb.mysql.com
4561b28df2 ndb - bug#16669
put nrtrace in out file instead (debug compiled..)
2006-03-13 12:29:43 +01:00
Reggie@xgeek.
d39e92049f Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  xgeek.:C:/work/mysql-5.1-new
2006-03-13 05:20:00 -06:00
Reggie@xgeek.
36121ee7ba base:
Fixed problem where taocrypt was defined too early in the process
2006-03-13 05:17:23 -06:00
petr@mysql.com
f513420d12 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/cps/mysql/trees/mysql-5.1-virgin
2006-03-13 13:57:22 +03:00
mikael@zim.(none)
6b185a935f BUG#15407: Crash if error in subpartition definition 2006-03-13 02:36:02 -08:00
msvensson@shellback.(none)
130985c2f6 Merge shellback.(none):/home/msvensson/mysql/init_rm/my51-init_rm
into  shellback.(none):/home/msvensson/mysql/mysql-5.1
2006-03-13 11:32:10 +01:00
msvensson@shellback.(none)
c13ae49342 Merge shellback.(none):/home/msvensson/mysql/init_rm/my50-init_rm
into  shellback.(none):/home/msvensson/mysql/mysql-5.0
2006-03-13 11:31:15 +01:00
msvensson@shellback.(none)
9afc40fccc Remove also slave clusters data on restart after test failure 2006-03-13 11:30:16 +01:00
msvensson@shellback.(none)
59e7e3810d Merge shellback.(none):/home/msvensson/mysql/init_rm/my50-init_rm
into  shellback.(none):/home/msvensson/mysql/init_rm/my51-init_rm
2006-03-13 11:13:58 +01:00
msvensson@shellback.(none)
2628ebe89f Remove printouts 2006-03-13 11:06:14 +01:00
msvensson@shellback.(none)
904e3ca2dc Merge shellback.(none):/home/msvensson/mysql/init_rm/my50-init_rm
into  shellback.(none):/home/msvensson/mysql/init_rm/my51-init_rm
2006-03-13 10:36:41 +01:00
msvensson@shellback.(none)
b32f1367fe Make mysql-test-run.pl restore the db(s) to a known state before continuing after test case failure 2006-03-13 10:30:36 +01:00
jmiller@mysql.com
ce3dcff2f3 Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
2006-03-13 09:55:42 +01:00
tomas@poseidon.ndb.mysql.com
5a4e512942 changed test to make it predictable 2006-03-13 09:55:41 +01:00
jonas@perch.ndb.mysql.com
0d11c2c180 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
into  perch.ndb.mysql.com:/home/jonas/src/51-new
2006-03-13 09:36:39 +01:00
jonas@perch.ndb.mysql.com
4d436c320d ndb - remove incorrect assertion
bug#17854, bug#18000
2006-03-13 09:19:24 +01:00
jmiller@mysql.com
92ce845796 Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
2006-03-13 09:05:26 +01:00
jmiller@mysql.com
43fb868e65 Test fix 2006-03-13 09:03:05 +01:00
petr@mysql.com
d91ea9e0cb Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/cps/mysql/trees/mysql-5.1-virgin
2006-03-13 10:27:03 +03:00
brian@zim.(none)
7128199563 Merge zim.(none):/home/brian/mysql/mysql-5.0
into  zim.(none):/home/brian/mysql/mysql-5.1-new
2006-03-12 06:49:03 -08:00
jonas@perch.ndb.mysql.com
45faa21a19 ndb -
Dont put object file in list of SOURCES...causing really weird make dist problem
2006-03-11 21:34:49 +01:00
jonas@perch.ndb.mysql.com
ec8ac0b3d7 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-03-11 19:39:56 +01:00
kent@mysql.com
b103fa3a21 dict0dict.h, dict0dict.c, ha_innodb.cc:
Make inline dict_table_is_comp() visible to ha_innodb.c as innodb_dict_table_is_comp()
2006-03-11 19:13:31 +01:00
jonas@perch.ndb.mysql.com
9effe54359 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-03-11 16:11:36 +01:00
tomas@poseidon.ndb.mysql.com
b9dcd3b154 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-03-11 15:55:19 +01:00
tomas@poseidon.ndb.mysql.com
a7e7a1acf4 wl#3023 clean up
- enabling some new tests
2006-03-11 15:52:38 +01:00
mikael@zim.(none)
d10a0e7e35 Ensure we discover also error in using subpartition parts in
non-subpartitioned tables in ALTER TABLE ADD/REORGANIZE PARTITION
2006-03-11 06:32:24 -08:00
mikael@zim.(none)
c34c2cfa45 BUG#15961: SUBPARTITION defined in non-subpartitioned table no error
Made sure that no subpartition stuff in non-subpartitioned table
2006-03-11 06:17:10 -08:00
mikael@zim.(none)
8d3c7e3b27 BUG#16370: Default subpartitioning not properly handled in conjunction
with ALTER TABLE ADD/REORGANIZE PARTITION
Ensure that default subpartitioning is removed when subpartitions
are defined in ADD/REORGANIZE PARTITION
2006-03-11 05:56:06 -08:00
aelkin@mysql.com
897a886f72 Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/5.1
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.1
2006-03-11 10:55:36 +02:00
aelkin@mysql.com
659710e29c Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/5.0
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/FIXES/5.0.20-bug15101-sysdate
2006-03-11 10:47:25 +02:00
tomas@poseidon.ndb.mysql.com
e4b7cd8eab Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-03-11 07:26:58 +01:00
tomas@poseidon.ndb.mysql.com
6131b282e1 ndb suma: added some VM_TRACE debug printouts for reposrtSubscribers 2006-03-11 07:14:36 +01:00
jonas@perch.ndb.mysql.com
038b361596 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-03-11 07:02:08 +01:00
tomas@poseidon.ndb.mysql.com
485580e436 wl#3023 ndb to return correct tables for initial table maps
+ removed extra binlog events generated by drop table schema ops to produce predictable test cases
2006-03-11 06:58:48 +01:00
kent@mysql.com
93da852c6c Merge 2006-03-11 01:53:30 +01:00
kent@mysql.com
013259eaf4 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
2006-03-11 01:42:42 +01:00
ingo@mysql.com
972c2a4abc Merge mysql.com:/home/mydev/mysql-5.0
into  mysql.com:/home/mydev/mysql-5.0-bug14980
2006-03-10 22:28:50 +01:00
ingo@mysql.com
3052249ec2 Merge mysql.com:/home/mydev/mysql-5.1
into  mysql.com:/home/mydev/mysql-5.1-bug14980
2006-03-10 22:24:13 +01:00
jonas@perch.ndb.mysql.com
9a2f243dce ndb -
Remove test dependancy of table order in backup
2006-03-10 21:43:50 +01:00
joerg@mysql.com
acfb14413e Merge mysql.com:/M50/mysql-5.0 into mysql.com:/M51/mysql-5.1 2006-03-10 21:05:10 +01:00
joerg@mysql.com
c80ae0a809 Merge mysql.com:/M50/bug-15861-5.0 into mysql.com:/M50/mysql-5.0 2006-03-10 21:00:15 +01:00
anozdrin@mysql.com
0e172496eb Merge mysql.com:/mnt/hda4/home/alik/MySQL/devel/5.0-tree
into  mysql.com:/mnt/hda4/home/alik/MySQL/devel/5.1-tree
2006-03-10 22:37:38 +03:00
anozdrin@mysql.com
41423cd05c Fix version of DEFINER-clause in mysqldump.
Now DEFINER-clause in stored routines is expected to appear
in 5.0.20 release, not in 5.0.19. as it was supposed before.
2006-03-10 22:23:04 +03:00
joerg@mysql.com
8266bdb0dc Manual merge from 5.0.19 to 5.1, affecting only the problem of bug#16144
ChangeSet@1.2053.37.11, 2006-03-04 23:04:48+03:00, konstantin@mysql.com
Null-merge as instructed there!
2006-03-10 20:22:06 +01:00
joerg@mysql.com
e3d8ab0270 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/M50/merge-5.0
2006-03-10 19:53:15 +01:00
joerg@mysql.com
12100342f9 Merge mysql.com:/M50/clone-5.0 into mysql.com:/M50/merge-5.0 2006-03-10 19:47:21 +01:00
brian@zim.(none)
91574a1dc6 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.(none):/home/brian/mysql/dep-5.1
2006-03-10 08:58:11 -08:00
brian@zim.(none)
07bd25c9f5 This is a patch to test the default schema location. 2006-03-10 08:54:12 -08:00
ingo@mysql.com
5fc79af387 Merge mysql.com:/home/mydev/mysql-5.0-bug14980
into  mysql.com:/home/mydev/mysql-5.1-bug14980
2006-03-10 17:52:28 +01:00