Alexander Nozdrin bd60794fd8 Merge from mysql-trunk-merge.		2009-10-19 17:36:19 +04:00
..
binlog	Merge from mysql-trunk-merge.	2009-10-19 17:36:19 +04:00
bugs	Bug #38205 Row-based Replication (RBR) causes inconsistencies: HA_ERR_FOUND_DUPP_KEY	2009-04-09 16:05:41 +03:00
federated	Manual merge.	2009-09-30 19:25:06 -03:00
funcs_1	merge mysql-next-mr-alik	2009-09-24 12:35:16 +02: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	Merge from mysql-trunk-merge.	2009-10-19 17:36:19 +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	Fix for BUG#42980 "Client doesn't set NUM_FLAG for DECIMAL and TIMESTAMP":	2009-09-30 12:25:50 +02:00
ndb_team	Merge BUG#43263 from 5.0-bugteam to 5.1-bugteam	2009-05-31 13:44:41 +08:00
parts	Merge to mysql-next-mr	2009-09-28 09:39:50 +02:00
rpl	Merge from mysql-trunk-merge.	2009-10-19 17:36:19 +04:00
rpl_ndb	BUG#44661: automerge local 5.1-bt bug branch --> local 5.1-bt up to date	2009-10-07 22:26:36 +01:00
stress	Merge trift2.:/MySQL/M51/mysql-5.1	2008-02-22 16:14:27 +01:00
sys_vars	Fixes to tests and their results, to account for differences between InnoDB 1.0.4 and the old builtin.	2009-08-07 22:04:53 +02:00