Alexander Nozdrin d328d5be33 Manual merge from mysql-trunk. ... Conflicts: - mysql-test/suite/rpl/r/rpl_stm_mixing_engines.result		2010-04-27 13:58:21 +04:00
..
binlog	Manual merge from mysql-trunk.	2010-04-27 13:58:21 +04:00
bugs	Bug #38205 Row-based Replication (RBR) causes inconsistencies: HA_ERR_FOUND_DUPP_KEY	2009-04-09 16:05:41 +03:00
engines	Correction to the disabled.def file in engines/iuds that got overwritten by	2010-04-07 11:28:28 -07:00
federated	Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.	2010-03-07 19:40:59 +03:00
funcs_1	Streamlined funcs_1.storedproc broken by the patch for bug #8433.	2010-03-20 21:34:51 +03: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	Applying InnoDB snapshot	2010-04-01 16:27:13 +04: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	manual merge for bug_29136, bug#29309.	2007-10-13 23:12:50 +03:00
ndb	BUG#51894 Replication failure with SBR on DROP TEMPORARY TABLE inside a	2010-04-20 10:10:43 +01: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	Post-fix for Bug#52444: update test result.	2010-04-15 12:12:03 +04:00
perfschema_stress	WL#2360 Performance schema	2010-01-11 18:47:27 -07:00
rpl	Manual merge from mysql-trunk.	2010-04-27 13:58:21 +04:00
rpl_ndb	BUG#51894 Replication failure with SBR on DROP TEMPORARY TABLE inside a	2010-04-20 10:10:43 +01:00
stress	Merge trift2.:/MySQL/M51/mysql-5.1	2008-02-22 16:14:27 +01:00
sys_vars	Added a test for skip_name_resolve to the sys_vars suite.	2010-04-20 11:32:39 +04:00