Davi Arnaut 84d2ae22fe Merge into mysql-trunk-merge..		2010-07-19 16:03:59 -03:00
..
binlog	Merge of mysql-trunk-bugfixing into mysql-trunk-merge.	2010-07-15 10:47:50 -03:00
bugs	Bug #49741 test files contain explicit references to bin/relay-log positions	2010-05-24 21:54:08 +08:00
engines	Manual merge	2010-05-26 22:34:25 +08:00
federated	Bug #53261 MTR tests archive_plugin and blackhole_plugin fail when compiling with cmake	2010-06-14 11:23:49 +02:00
funcs_1	merge	2010-07-16 18:04:39 +03:00
funcs_2	merge 5.0-> 5.1	2009-04-24 13:00:17 -04:00
ibmdb2i	Unset the execute bit where it's not needed.	2010-07-03 20:17:03 -03:00
innodb	manual merge from mysql-5.1-security	2010-07-07 14:18:20 +02:00
jp	WL#2360 Performance schema	2010-01-11 18:47:27 -07:00
large_tests	bug#50296	2010-02-28 19:39:28 +02:00
manual	Bug #49741 test files contain explicit references to bin/relay-log positions	2010-05-24 21:54:08 +08:00
ndb	Disabling failing NDB-tests due to Bug 54850 and Bug 54851.	2010-07-02 10:23:00 +04:00
ndb_team	Manual merge	2010-05-26 22:34:25 +08:00
parts	WL#5349 Change default storage engine to InnoDB	2010-06-17 22:51:35 +02:00
perfschema	Bug#53613: mysql_upgrade incorrectly revokes ...	2010-07-15 18:57:47 -03:00
perfschema_stress	WL#2360 Performance schema	2010-01-11 18:47:27 -07:00
rpl	Merge of mysql-trunk-bugfixing into mysql-trunk-merge.	2010-07-15 10:47:50 -03:00
rpl_ndb	Disabling failing NDB-tests due to Bug 54850 and Bug 54851.	2010-07-02 10:23:00 +04:00
stress	Merge trift2.:/MySQL/M51/mysql-5.1	2008-02-22 16:14:27 +01:00
sys_vars	WL#5486: Remove code for unsupported platforms	2010-07-15 08:13:30 -03:00