Vladislav Vaintroub 3de0482551 merge		2009-12-19 14:11:48 +01:00
..
binlog	Manual merge from mysql-trunk-merge.	2009-12-17 22:16:54 +03:00
bugs	Bug #38205 Row-based Replication (RBR) causes inconsistencies: HA_ERR_FOUND_DUPP_KEY	2009-04-09 16:05:41 +03:00
federated	merging 5.1 main -> rpl+2. Some manual work required mostly due to bug46640	2009-11-06 18:35:04 +02:00
funcs_1	Auto-merge from mysql-next-mr-bugfixing.	2009-12-10 22:27:28 +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	Disable main.innodb and innodb.innodb-index until BUG#49396 is fixed.	2009-12-03 17:33:24 +05:30
jp	Bug #45159 : some tests in suite "jp" fail in embedded server (use LOAD DATA)	2009-09-11 15:52:08 +03:00
large_tests	This is the downport of	2009-09-11 22:26:35 +02:00
manual	manual merge for bug_29136, bug#29309.	2007-10-13 23:12:50 +03:00
ndb	Manual merge from mysql-next-mr.	2009-11-02 14:10:04 +03:00
ndb_team	Merge BUG#43263 from 5.0-bugteam to 5.1-bugteam	2009-05-31 13:44:41 +08:00
parts	merge	2009-12-19 14:11:48 +01:00
rpl	Post-merge fix after BUG##45292	2009-12-18 11:15:46 +00:00
rpl_ndb	Manual resolving for the following files	2009-12-01 21:07:18 +02:00
stress	Merge trift2.:/MySQL/M51/mysql-5.1	2008-02-22 16:14:27 +01:00
sys_vars	Backport of Bug#36785 to mysql-next-mr	2009-11-10 16:26:39 -02:00