Commit graph

8859 commits

Author SHA1 Message Date
msvensson@neptunus.(none)
958a4cd0d3 Merge msvensson@devsrv-b:/space/magnus/bug17261/my50-bug17261
into  neptunus.(none):/home/msvensson/mysql/bug11835/my50-bug11835
2006-03-10 10:16:50 +01:00
mskold@mysql.com
fb3286312f Reverted to previous error codes, since some common tests depend in it 2006-03-10 09:57:00 +01:00
mikael@zim.(none)
0d54bc885f Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.(none):/home/mikael/bug17947
2006-03-10 00:51:13 -08:00
mskold@mysql.com
596f2ae03e Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
2006-03-10 09:44:23 +01:00
cmiller@calliope.local
34a74d65ba Merge calliope.local:/Users/cmiller/work/src/mysql-5.1-new
into  calliope.local:/Users/cmiller/work/src/mysql-5.1-new__cleanup_mysqldump
2006-03-09 22:23:35 -05:00
cmiller@calliope.local
9747057fa9 Merge calliope.local:/Users/cmiller/work/src/mysql-5.1-new
into  calliope.local:/Users/cmiller/work/src/mysql-5.1-new__cleanup_mysqldump
2006-03-09 15:22:11 -05:00
cmiller@calliope.local
d3c0dc0eed Added code to mysqldump to dump timed events when instructed to do so, with
the '-E' or '--events' flag.  (Closes Bug#16853 and Bug#17714.)


WARNING:

At present, these tests fail due to b*g number 18078.
2006-03-09 15:12:43 -05:00
msvensson@neptunus.(none)
8511dd9ae5 Merge bk-internal:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-03-09 21:09:37 +01:00
msvensson@neptunus.(none)
6d3f51928c Merge bk-internal:/home/bk/mysql-5.1-new
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-03-09 21:09:32 +01:00
paul@snake-hub.snake.net
0ecec577fc Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1
2006-03-09 13:18:13 -06:00
paul@snake-hub.snake.net
d59d62c5dc mysqltest.test:
Fix typos.
2006-03-09 13:17:19 -06:00
mskold@mysql.com
7d4ed3028a Added more tests for bug#18040: Create unique index cause error 4243 2006-03-09 20:08:30 +01:00
mikael@zim.(none)
abc1816dc2 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.(none):/home/mikael/bug17947
2006-03-09 10:51:49 -08:00
brian@zim.(none)
e5161fb802 Merge zim.(none):/home/brian/mysql/mysql-5.0
into  zim.(none):/home/brian/mysql/mysql-5.1-new
2006-03-09 10:39:40 -08:00
mikael@zim.(none)
da431d48c9 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.(none):/home/mikael/bug17947
2006-03-09 10:29:17 -08:00
mikael@zim.(none)
eed9568833 BUG#17947: Crash when REBUILD PARTITION syntax error 2006-03-09 10:19:25 -08:00
msvensson@neptunus.(none)
483f53b440 Merge bk-internal:/home/bk/mysql-5.1-new
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-03-09 19:06:15 +01:00
anozdrin@mysql.com
c5895a9686 After-merge fixes. 2006-03-09 21:00:45 +03:00
anozdrin@mysql.com
c1ef46fcc7 Merge mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.0-tree
into  mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.1-merged
2006-03-09 20:41:21 +03:00
mikron@mikael-ronstr-ms-dator.local
0a48cd762a BUG#17127: Crash if wrong use of VALUES for list partition 2006-03-09 18:19:34 +01:00
pekka@mysql.com
c824a4095d Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/space/pekka/ndb/version/my51
2006-03-09 17:20:33 +01:00
jmiller@mysql.com
eabdcb34ba Cleanup 2006-03-09 17:19:39 +01:00
pekka@mysql.com
09ea958717 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/space/pekka/ndb/version/my51
2006-03-09 17:18:16 +01:00
pekka@mysql.com
6e07985293 ndb - bug#18067 bug#18075 closes these bugs 2006-03-09 17:16:04 +01:00
jmiller@mysql.com
f01668afd3 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-09 17:15:40 +01:00
jmiller@mysql.com
aca1b9d766 rpl_ndb_dd_advance.result:
Updated results
rpl_ndb_dd_advance.test:
  Updated test case from comments in Tomas's review
  Changes bug number comment
2006-03-09 17:14:33 +01:00
lars@mysql.com
70d467e89a Test fixes 2006-03-09 16:30:59 +01:00
lars@mysql.com
6bcac9fcc6 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new
into  mysql.com:/users/lthalmann/bk/mysql-5.1-new-wl3023-mats
2006-03-09 16:12:58 +01:00
lars@mysql.com
418a8656d9 Fix to not replicate mysql.event table
Test fixes
2006-03-09 15:59:29 +01:00
msvensson@neptunus.(none)
8bd2c37d20 Merge bk-internal:/home/bk/mysql-5.1-new
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-03-09 15:51:57 +01:00
tomas@poseidon.ndb.mysql.com
6c1b0b37b6 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-09 15:51:54 +01:00
msvensson@neptunus.(none)
686c8eb001 Merge bk-internal:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-03-09 15:49:32 +01:00
msvensson@neptunus.(none)
e316aa6de9 Merge bk-internal:/home/bk/mysql-5.1-new
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-03-09 13:13:55 +01:00
msvensson@neptunus.(none)
96a9857b1e Merge bk-internal:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-03-09 13:13:04 +01:00
msvensson@neptunus.(none)
ebb3f2c348 Merge neptunus.(none):/home/msvensson/mysql/bug10656/my51-bug10656
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-03-09 13:12:20 +01:00
msvensson@neptunus.(none)
e28000c201 Merge neptunus.(none):/home/msvensson/mysql/bug10656/my50-bug10656
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-03-09 13:11:40 +01:00
msvensson@neptunus.(none)
64003dae21 Merge neptunus.(none):/home/msvensson/mysql/bug10656/my50-bug10656
into  neptunus.(none):/home/msvensson/mysql/bug10656/my51-bug10656
2006-03-09 12:55:56 +01:00
msvensson@neptunus.(none)
a7b954447f Bug#10656 Stored Procedure - Create index and Truncate table command error
-Add test case
Move testcase that needs innodb from sp.test => sp_trans.test
2006-03-09 12:08:23 +01:00
evgen@moonbone.local
3d37ec6b8b Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into moonbone.local:/work/17726-bug-5.0-mysql
2006-03-09 14:07:34 +03:00
msvensson@neptunus.(none)
e4bdc16f2e Merge bk-internal:/home/bk/mysql-5.1-new
into  neptunus.(none):/home/msvensson/mysql/bug17137/my51-bug17137
2006-03-09 12:02:29 +01:00
msvensson@neptunus.(none)
80c8ba2fe7 Make test case run only for statement logging 2006-03-09 12:00:12 +01:00
bar@mysql.com
8c2fb88a8f Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new/
into  mysql.com:/usr/home/bar/mysql-5.1-new.b16318
2006-03-09 11:53:56 +04:00
msvensson@neptunus.(none)
bdb10d3ffd Merge bk-internal:/home/bk/mysql-5.1-new
into  neptunus.(none):/home/msvensson/mysql/bug17137/my51-bug17137
2006-03-09 08:15:09 +01:00
holyfoot@mysql.com
597fe4b178 Merge bk@192.168.21.1:mysql-5.0
into mysql.com:/home/hf/work/mysql-5.0.mrg
2006-03-09 10:38:41 +04:00
holyfoot@mysql.com
481dc5b7e5 Merge bk@192.168.21.1:mysql-5.1-new
into mysql.com:/home/hf/work/mysql-5.1.mrg
2006-03-09 10:21:58 +04:00
jmiller@mysql.com
d721e51764 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-09 04:22:19 +01:00
mats@mysql.com
cf5589a831 Merge mysql.com:/users/mkindahl/bk/mysql-5.1-new-wl3023
into  mysql.com:/users/mkindahl/bk/merge-mysql-5.1-new-wl3023
2006-03-09 04:08:30 +01:00
mats@mysql.com
90215eb387 WL#3023 (Use locks in statement-like manner):
Post-merge patches.
2006-03-09 03:56:14 +01:00
jmiller@mysql.com
e517d40a43 New test to satisfy some of the 5.1 CR test plan 2006-03-09 03:37:25 +01:00
tomas@poseidon.ndb.mysql.com
610aa1e07c Bug #17838 binlog not setup on seconday master after rename
-added setting up of binlogging after receiving rename table
+cleanup
2006-03-09 01:04:13 +01:00