Luis Soares a85150c364 BUG#11762616: BUG#55229: 'POSTION' ... Manual merge from mysql-5.1 into mysql-5.5. Conflicts ========= Text conflict in mysql-test/suite/rpl/t/rpl_row_until.test Text conflict in sql/handler.h Text conflict in storage/archive/ha_archive.cc		2011-05-06 00:50:31 +01:00
..
binlog	autocommit 5.1->5.5	2011-04-26 00:01:11 +04:00
engines	merge from mysql-5.1 -> mysql-5.5	2011-03-01 21:33:00 +05:30
federated
funcs_1	Bug#11766500 - 59624: FUNCS_1 SUITE TESTS FAILING WITH RESULT DIFFERENCE WHEN RUN USING EMBEDDED MODE	2011-03-22 10:02:51 +05:30
funcs_2	BUG #59055: RQG was broken after the checkin that removed rpl and rpl_ndb suites. RQG uses MTR V1 and that still has these in the default suite. Removing these from V1. Also removing references to ndb tests in some more disabled.def files	2010-12-21 23:14:48 +05:30
innodb	Bug#60309 - Bug#12356829: MYSQL 5.5.9 FOR MAC OSX HAS BUG WITH FOREIGN KEY CONSTRAINTS	2011-04-26 12:55:52 -05:00
jp
large_tests	BUG#11877618: rpl_slave_net_timeout fails in rpl_sync.inc (at sync_slave_with_master)	2011-03-17 11:31:42 +01:00
manual	BUG#49978: Replication tests don't clean up replication state at the end	2010-12-19 18:07:28 +01:00
parts	fix of partitioning tests that fails on windows + merge of minor cleanup	2011-04-29 09:56:36 +02:00
perfschema	Test cleanup	2011-03-11 11:45:16 +01:00
perfschema_stress
rpl	BUG#11762616: BUG#55229: 'POSTION'	2011-05-06 00:50:31 +01:00
stress	Bug #59055 : Remove ndb tests from repository. Removal of tests from sys_vars is pending. It has some issues that are yet to be resolved	2010-12-20 19:49:35 +05:30
sys_vars	Merged bug #11766769 to 5.5.	2011-03-25 14:55:22 +02:00