Luis Soares df8543868d merge: 5.1 -> 5.1-rpl ... conflicts: Text conflict in client/mysqltest.cc Text conflict in mysql-test/include/wait_until_connected_again.inc Text conflict in mysql-test/lib/mtr_report.pm Text conflict in mysql-test/mysql-test-run.pl Text conflict in mysql-test/r/events_bugs.result Text conflict in mysql-test/r/log_state.result Text conflict in mysql-test/r/myisam_data_pointer_size_func.result Text conflict in mysql-test/r/mysqlcheck.result Text conflict in mysql-test/r/query_cache.result Text conflict in mysql-test/r/status.result Text conflict in mysql-test/suite/binlog/r/binlog_index.result Text conflict in mysql-test/suite/binlog/r/binlog_innodb.result Text conflict in mysql-test/suite/rpl/r/rpl_packet.result Text conflict in mysql-test/suite/rpl/t/rpl_packet.test Text conflict in mysql-test/t/disabled.def Text conflict in mysql-test/t/events_bugs.test Text conflict in mysql-test/t/log_state.test Text conflict in mysql-test/t/myisam_data_pointer_size_func.test Text conflict in mysql-test/t/mysqlcheck.test Text conflict in mysql-test/t/query_cache.test Text conflict in mysql-test/t/rpl_init_slave_func.test Text conflict in mysql-test/t/status.test		2009-01-23 13:22:05 +01: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#38350: Many tests don't clean up after themselves on exit.	2008-11-13 20:19:00 +01: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_grant.test	Bug #39106:	2008-09-09 12:19:31 +02: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	Fix a few problems after latest bunch of InnoDB snapshot changes:	2009-01-08 03:06:54 +01:00
binlog_innodb_row.test	Bug #40221 Replication failure on RBR + UPDATE the primary key	2008-12-08 17:07:08 +02:00
binlog_killed.test	Merging 5.1 main into 5.1-rpl	2008-10-23 21:27:09 +02: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	Merging 5.1 main into 5.1-rpl	2008-10-23 21:27:09 +02:00
binlog_mix_innodb_stat.test	Bug#37312: Make test binlog_{row,stm}_innodb_stat more robust	2008-09-08 16:23:55 -04:00
binlog_multi_engine.test	Bug #38360: BLACKHOLE replication with RBR is broken	2008-10-02 11:02:38 +02: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	Merge 5.0 -> 5.1	2008-09-30 15:32:35 -04: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	Bug#37312: Make test binlog_{row,stm}_innodb_stat more robust	2008-09-08 16:23:55 -04: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_stm_row.test	Bug#34306: Can't make copy of log tables when server binary log is enabled	2008-09-29 10:53:40 -03: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