Sven Sandberg f68e754984 Disabled part of rpl_change_master that fails sporadically because of BUG#59037.		2010-12-19 18:16:01 +01:00
..
binlog	Merged BUG#49978 from 5.1-bugteam to 5.5-bugteam.	2010-12-19 18:15:12 +01:00
bugs	Merged BUG#49978 from 5.1-bugteam to 5.5-bugteam.	2010-12-19 18:15:12 +01:00
engines	Manual merge	2010-05-26 22:34:25 +08:00
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 #57916: Fix the naming of the proxy_priv table	2010-11-02 17:45:26 +02:00
funcs_2	Bug#53563 Fix and enable charset/collation tests in funcs_2	2010-08-19 09:31:24 +02:00
innodb	Manual merge from mysql-5.5.	2010-12-16 21:43:21 +03:00
jp
large_tests	Merged BUG#49978 from 5.1-bugteam to 5.5-bugteam.	2010-12-19 18:15:12 +01:00
manual	BUG#49978: Replication tests don't clean up replication state at the end	2010-12-19 18:07:28 +01:00
ndb	merged	2010-10-05 11:47:03 +03:00
ndb_team	Merged BUG#49978 from 5.1-bugteam to 5.5-bugteam.	2010-12-19 18:15:12 +01:00
parts	Merged BUG#49978 from 5.1-bugteam to 5.5-bugteam.	2010-12-19 18:15:12 +01:00
perfschema	Local merge	2010-12-01 19:07:57 +01:00
perfschema_stress	Tests: many if/while expresissons simplified after 57276	2010-11-17 11:16:13 +01:00
rpl	Disabled part of rpl_change_master that fails sporadically because of BUG#59037.	2010-12-19 18:16:01 +01:00
rpl_ndb	Merged BUG#49978 from 5.1-bugteam to 5.5-bugteam.	2010-12-19 18:15:12 +01:00
stress
sys_vars	Merged BUG#49978 from 5.1-bugteam to 5.5-bugteam.	2010-12-19 18:15:12 +01:00