Vasil Dimov dc4a8b35a0 Merge mysql-trunk-bugfixing -> mysql-trunk-innodb		2010-05-19 23:48:50 +03:00
..
binlog	BUG#50670: Slave stops with error code 1644	2010-04-28 14:47:49 +02:00
bugs	Bug #38205 Row-based Replication (RBR) causes inconsistencies: HA_ERR_FOUND_DUPP_KEY	2009-04-09 16:05:41 +03:00
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	merge 5.0-> 5.1	2009-04-24 13:00:17 -04:00
ibmdb2i	Bug#49329 example (and other) engines use wrong collation for open tables hash	2009-12-11 12:31:16 +05:30
innodb	Merge a change from mysql-5.1-innodb:	2010-05-18 16:10:36 +03: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	Merge BUG#43263 from 5.0-bugteam to 5.1-bugteam	2009-05-31 13:44:41 +08:00
parts	Manual merge of mysql-trunk into mysql-trunk-merge.	2010-03-24 18:03:44 +03:00
perfschema	BUG#50670: Slave stops with error code 1644	2010-04-28 14:47:49 +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	Merge from mysql-5.1-innodb:	2010-05-11 20:02:49 +03:00