Alexander Nozdrin c323c2d8bf Auto-merge from mysql-next-mr-bugfixing.		2009-12-10 22:27:28 +03:00
..
binlog	Manual merge from mysql-next-mr.	2009-12-02 18:50:14 +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#45983 ibmdb2i_create_index_option=1 not working for primary key	2009-07-08 14:40:01 +05:30
innodb	Updates for test cases from innodb-zip-ss6129.	2009-11-05 17:23:50 +04:00
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	Auto-merge from mysql-next-mr-bugfixing.	2009-12-10 22:27:28 +03:00
rpl	Auto merge from 5.1-rep-semisync	2009-12-05 10:28:53 +08: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