Luis Soares 19b16fc572 BUG#11746302 ... Manual merged mysql-5.1-gca into latest mysql-5.5. Conflicts ========= Text conflict in mysql-test/suite/rpl/r/rpl_relayspace.result Text conflict in mysql-test/suite/rpl/t/rpl_relayspace.test		2011-05-19 16:47:05 +01:00
..
binlog	Bug#12346411 SQL/LOG.CC:6509: ASSERTION `PREPARED_XIDS > 0' FAILED	2011-05-12 14:56:00 +02:00
engines	merge from mysql-5.1 -> mysql-5.5	2011-03-01 21:33:00 +05:30
federated	Bug#35333, "If Federated table can't connect to remote host, can't retrieve	2010-11-30 11:20:56 -06:00
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	WL#2360 Performance schema	2010-01-11 18:47:27 -07:00
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	Merge 5.5	2011-04-15 15:46:11 +02:00
perfschema_stress	Tests: many if/while expresissons simplified after 57276	2010-11-17 11:16:13 +01:00
rpl	BUG#11746302	2011-05-19 16:47:05 +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	Merge 5.5	2011-04-15 15:46:11 +02:00