Vasil Dimov 96c47c4df1 Merge mysql-trunk-bugfixing -> mysql-trunk-innodb ... (skipping the change to storage/innobase/os/os0file.c because that issue has already been addressed in mysql-trunk-innodb)		2010-05-27 12:47:57 +03:00
..
binlog	BUG#50670: Slave stops with error code 1644	2010-04-28 14:47:49 +02:00
bugs
engines	Changes to result files in the engine suite - missed from previous commit	2010-05-04 13:39:17 -07:00
federated	Patch for 47759 to trunk-bugfixing.	2010-05-05 09:35:38 +02:00
funcs_1	Patch for Bug#21818 (Return value of ROW_COUNT() is incorrect	2010-05-14 09:28:51 +04:00
funcs_2
ibmdb2i	Bug#49329 example (and other) engines use wrong collation for open tables hash	2009-12-11 12:31:16 +05:30
innodb	Check in the support for Information Schema System Table Views. Users	2010-05-25 18:44:33 -07: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
ndb	BUG#50670: Slave stops with error code 1644	2010-04-28 14:47:49 +02:00
ndb_team
parts	Manual merge of mysql-trunk into mysql-trunk-merge.	2010-03-24 18:03:44 +03:00
perfschema	post push fix	2010-05-25 11:34:36 +02:00
perfschema_stress	WL#2360 Performance schema	2010-01-11 18:47:27 -07:00
rpl	reverting fixes for Bug@50316 in mysql-trunk	2010-05-18 18:32:44 +03:00
rpl_ndb	reverting fixes for Bug@50316 in mysql-trunk	2010-05-18 18:32:44 +03:00
stress
sys_vars	(second attempt) Disable the tests on embedded windows that fail due to	2010-05-25 10:36:06 +03:00