Sven Sandberg 4cf30d44ef merged 5.1 main to 5.1-rpl ... manually resolved conflicts: Text conflict in client/mysqltest.c Contents conflict in mysql-test/include/have_bug25714.inc Text conflict in mysql-test/include/have_ndbapi_examples.inc Text conflict in mysql-test/mysql-test-run.pl Text conflict in mysql-test/suite/parts/inc/partition_check_drop.inc Text conflict in mysql-test/suite/parts/inc/partition_layout.inc Text conflict in mysql-test/suite/parts/inc/partition_layout_check1.inc Text conflict in mysql-test/suite/parts/inc/partition_layout_check2.inc Text conflict in mysql-test/suite/parts/r/partition_alter1_1_2_myisam.result Text conflict in mysql-test/suite/parts/r/partition_alter1_1_myisam.result Text conflict in mysql-test/suite/parts/r/partition_alter1_2_myisam.result Text conflict in mysql-test/suite/parts/r/partition_alter2_myisam.result Text conflict in mysql-test/suite/parts/r/partition_alter3_innodb.result Text conflict in mysql-test/suite/parts/r/partition_alter3_myisam.result Text conflict in mysql-test/suite/parts/r/partition_basic_innodb.result Text conflict in mysql-test/suite/parts/r/partition_basic_myisam.result Text conflict in mysql-test/suite/parts/r/partition_basic_symlink_myisam.result Text conflict in mysql-test/suite/parts/r/partition_engine_myisam.result Text conflict in mysql-test/suite/parts/r/partition_syntax_myisam.result Text conflict in mysql-test/suite/rpl_ndb/t/disabled.def Text conflict in mysql-test/t/disabled.def		2008-08-04 07:04:47 +02:00
..
binlog_auto_increment_bug33029-master.opt	BUG#33029 5.0 to 5.1 replication fails on dup key when inserting	2008-03-14 11:35:41 +08:00
binlog_auto_increment_bug33029.test	BUG#37975: wait_for_slave_* should increase the timeout	2008-07-10 18:09:39 +02:00
binlog_base64_flag.test	BUG#37426: RBR breaks for CHAR() UTF-8 fields > 85 chars	2008-06-30 22:11:18 +02:00
binlog_database.test	Bug#32435:	2007-11-16 15:55:22 +01:00
binlog_index.test	Fix for binlog_index test case: hide difference for paths from warning messages between Windows and Unix	2008-04-05 15:09:53 +04:00
binlog_innodb.test	Updates to allow innodb.test to be run with --embedded-server,	2007-08-14 15:35:19 -06:00
binlog_killed.test	Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl	2008-02-28 12:21:44 +01:00
binlog_killed_simulate-master.opt	bug#27571 merging. Fixing offsets and moving tests to the corrent	2007-10-31 11:48:49 +02:00
binlog_killed_simulate.test	Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl	2008-02-28 12:21:44 +01:00
binlog_multi_engine.test	Bug#32663, Bug#33045, Bug#23533, WL#4091	2008-02-29 00:50:15 +03:00
binlog_old_versions.test	Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1	2008-02-07 12:38:13 +01:00
binlog_row_binlog-master.opt	WL#3933 Split main test suite to rpl, rpl_ndb and ndb	2007-06-27 14:28:02 +02:00
binlog_row_binlog.test	WL#3933 Split main test suite to rpl, rpl_ndb and ndb	2007-06-27 14:28:02 +02:00
binlog_row_ctype_cp932.test	WL#3933 Split main test suite to rpl, rpl_ndb and ndb	2007-06-27 14:28:02 +02:00
binlog_row_ctype_ucs.test	WL#3933 Split main test suite to rpl, rpl_ndb and ndb	2007-06-27 14:28:02 +02:00
binlog_row_drop_tmp_tbl.test	WL#3933 Split main test suite to rpl, rpl_ndb and ndb	2007-06-27 14:28:02 +02:00
binlog_row_innodb_stat-master.opt	WL#3933 Split main test suite to rpl, rpl_ndb and ndb	2007-06-27 14:28:02 +02:00
binlog_row_innodb_stat.test	WL#3933 Split main test suite to rpl, rpl_ndb and ndb	2007-06-27 14:28:02 +02:00
binlog_row_insert_select.test	WL#3933 Split main test suite to rpl, rpl_ndb and ndb	2007-06-27 14:28:02 +02:00
binlog_row_mix_innodb_myisam-master.opt	WL#3933 Split main test suite to rpl, rpl_ndb and ndb	2007-06-27 14:28:02 +02:00
binlog_row_mix_innodb_myisam.test	Post-merge fixes to make tests pass.	2008-01-11 13:25:26 +01:00
binlog_start_comment.test	Fix after merge	2008-02-28 18:55:46 +01:00
binlog_statement_insert_delayed.test	WL#3933 Split main test suite to rpl, rpl_ndb and ndb	2007-06-27 14:28:02 +02:00
binlog_stm_binlog-master.opt	WL#3933 Split main test suite to rpl, rpl_ndb and ndb	2007-06-27 14:28:02 +02:00
binlog_stm_binlog.test	WL#3933 Split main test suite to rpl, rpl_ndb and ndb	2007-06-27 14:28:02 +02:00
binlog_stm_blackhole.test	WL#3933 Split main test suite to rpl, rpl_ndb and ndb	2007-06-27 14:28:02 +02:00
binlog_stm_ctype_cp932.test	WL#3933 Split main test suite to rpl, rpl_ndb and ndb	2007-06-27 14:28:02 +02:00
binlog_stm_ctype_ucs.test	WL#3933 Split main test suite to rpl, rpl_ndb and ndb	2007-06-27 14:28:02 +02:00
binlog_stm_drop_tmp_tbl.test	WL#3933 Split main test suite to rpl, rpl_ndb and ndb	2007-06-27 14:28:02 +02:00
binlog_stm_innodb_stat-master.opt	WL#3933 Split main test suite to rpl, rpl_ndb and ndb	2007-06-27 14:28:02 +02:00
binlog_stm_innodb_stat.test	WL#3933 Split main test suite to rpl, rpl_ndb and ndb	2007-06-27 14:28:02 +02:00
binlog_stm_insert_select.test	WL#3933 Split main test suite to rpl, rpl_ndb and ndb	2007-06-27 14:28:02 +02:00
binlog_stm_mix_innodb_myisam-master.opt	WL#3933 Split main test suite to rpl, rpl_ndb and ndb	2007-06-27 14:28:02 +02:00
binlog_stm_mix_innodb_myisam.test	Test changes to fix failures in pushbuild.	2008-01-29 14:43:41 +01:00
binlog_stm_ps.test	BUG#34768 - nondeterministic INSERT using LIMIT logged in stmt mode	2008-03-25 17:28:12 +04:00
binlog_unsafe.test	Merge stella.local:/home2/mydev/mysql-5.1-ateam	2008-03-26 10:56:03 +01:00
disabled.def	Bug#32663, Bug#33045, Bug#23533, WL#4091	2008-02-29 00:50:15 +03:00