Sven Sandberg 25b6b026a7 BUG#37200: rpl_switch_stm_row_mixed fails sporadically in pushbuild ... This bug has been fixed in two slightly different ways in 6.0-rpl and {5.1,6.0}-bugteam. To avoid future merge problems, I'm now copying the 6.0-rpl fix to 5.1-bugteam.		2008-07-03 10:27:25 +02:00
..
binlog	Fix merge problems and re-record output for legitimate changes.	2008-05-16 11:35:15 -04:00
bugs	Bug#36443 Server crashes when executing insert when insert trigger on table	2008-06-19 21:47:59 +03:00
funcs_1	upmerge into 5.1	2008-07-01 15:07:34 -04:00
funcs_2	As result of WL#4204 all charset tests are now disabled.	2008-03-03 15:58:56 +01:00
im	Move instance manager tests to it's own suite	2007-08-29 19:02:33 +02:00
jp	Fix for	2008-05-15 18:01:13 +02:00
large_tests	Bug#27029 alter table ... enable keys crashes mysqld on large table	2007-06-21 12:45:56 -04:00
manual	manual merge for bug_29136, bug#29309.	2007-10-13 23:12:50 +03:00
ndb	Enabled rpl: rpl_view, rpl_ndb_multi, rpl_log_pos	2008-04-24 16:43:08 +05:00
ndb_team	Merge trift2.:/MySQL/M51/mysql-5.1	2008-02-22 16:14:27 +01:00
parts	Merge magare.gmz:/home/kgeorge/mysql/work/B36011-take2-5.0-bugteam	2008-05-16 19:03:50 +03:00
rpl	BUG#37200: rpl_switch_stm_row_mixed fails sporadically in pushbuild	2008-07-03 10:27:25 +02:00
rpl_ndb	Fixed bug #37076: TIMESTAMP/DATETIME/DATE values are not	2008-06-19 18:02:04 +05:00
stress	Merge trift2.:/MySQL/M51/mysql-5.1	2008-02-22 16:14:27 +01:00