unknown 1378aa0e8f Automatic merge.		2010-01-05 15:28:34 +01:00
..
binlog	Manual Merge	2009-11-03 18:20:08 +08:00
bugs	Bug #38205 Row-based Replication (RBR) causes inconsistencies: HA_ERR_FOUND_DUPP_KEY	2009-04-09 16:05:41 +03:00
federated	Merge with MySQL 5.1, with following additions:	2009-11-16 21:49:51 +01:00
funcs_1	Changed -1 row number in some warnings to 0	2009-12-06 19:26:12 +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
im	Move instance manager tests to it's own suite	2007-08-29 19:02:33 +02:00
innodb	Merge MySQL 5.1.41 into MariaDB trunk, including a number of after-merge fixes.	2009-11-30 22:37:27 +01: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	Bug#27029 alter table ... enable keys crashes mysqld on large table	2007-06-21 12:45:56 -04:00
manual	manual merge for bug_29136, bug#29309.	2007-10-13 23:12:50 +03:00
maria	Automatic merge with 5.1-merge	2009-10-14 11:09:56 +03:00
ndb	Merge MySQL->MariaDB	2009-09-08 00:50:10 +04:00
ndb_team	Merge BUG#43263 from 5.0-bugteam to 5.1-bugteam	2009-05-31 13:44:41 +08:00
parts	Merge with MySQL 5.1, with following additions:	2009-11-16 21:49:51 +01:00
pbxt	Merge Sergey's fix for pbxt.join_nested.	2009-12-29 12:18:37 +01:00
rpl	Fix test suite so that it works when doing configure --without-uca	2009-12-27 15:54:41 +02: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	Merge MySQL->MariaDB	2009-09-08 00:50:10 +04:00