Alexey Kopytov 7320a95808 Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. ... Conflicts: Text conflict in mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result Text conflict in sql/log.cc Text conflict in sql/set_var.cc Text conflict in sql/sql_class.cc		2010-04-03 21:35:51 +04:00
..
binlog	Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.	2010-04-03 21:35:51 +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	Test suites for engine testing, moved from test-extra so will be available	2010-03-17 23:42:07 -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	WL#4738 streamline/simplify @@variable creation process	2009-12-22 10:35:56 +01: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	Mergine from mysql-next-me	2010-02-27 11:43:32 +04: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	Skip perfschema.misc if "var" is a symlink (due to Bug 51447).	2010-03-16 17:19:45 +03:00
perfschema_stress	WL#2360 Performance schema	2010-01-11 18:47:27 -07:00
rpl	Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.	2010-04-03 21:35:51 +04:00
rpl_ndb	A patch for Bug#52071 (rpl_ndb.rpl_ndb_ctype_ucs2_def fails).	2010-03-15 20:00:20 +03:00
stress
sys_vars	Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.	2010-04-02 19:17:43 +04:00