Michael Widenius 945fa0d913 Merge with mysql-maria tree ... mysql-test/t/variables.test: Reset delay_key_write, otherwise maria.maria test may fail sql/set_var.cc: Reset ha_open_options if one resets the delay_key_write variable. Before there was no way to reset it without restarting mysqld, which caused some tests to fail		2009-02-19 11:01:25 +02:00
..
binlog	Merge with base MySQL 5.1	2009-02-15 12:58:34 +02:00
bugs	merged 5.1-main -> 5.1-bugteam	2009-01-30 15:44:49 +02:00
federated	fixed system_mysql_db_fix30020 test faiilure	2009-02-02 13:36:03 +02:00
funcs_1	Merge with base MySQL 5.1	2009-02-15 12:58:34 +02:00
funcs_2	Fix for Bug#40904 20 tests in 5.1 are disabled in a bad manner	2008-12-08 15:36:42 +01:00
im	Move instance manager tests to it's own suite	2007-08-29 19:02:33 +02:00
jp	fixed jp test failures	2009-02-02 14:42:33 +04:00
large_tests
manual	manual merge for bug_29136, bug#29309.	2007-10-13 23:12:50 +03:00
maria	Merge with mysql-maria tree	2009-02-19 11:01:25 +02:00
ndb	Merge with base MySQL 5.1	2009-02-15 12:58:34 +02:00
ndb_team	merging 5.1 -> 5.1 rpl. 3 of 4 conflicts are resolved similarly to 6.0->6.0-rpl merging.	2008-11-12 19:51:47 +02:00
parts	Merge with base MySQL 5.1	2009-02-15 12:58:34 +02:00
rpl	Merge with mysql-maria tree	2009-02-19 11:01:25 +02:00
rpl_ndb	Bug #41732 rpl_ndb_circular_2ch needs an updated configuration file	2009-02-02 22:31:01 +02:00
stress	Merge trift2.:/MySQL/M51/mysql-5.1	2008-02-22 16:14:27 +01:00
sys_vars	Merge with base MySQL 5.1	2009-02-15 12:58:34 +02:00