MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Sven Sandberg Date:October 29 2008 1:27pm
Subject:bzr commit into mysql-6.0-rpl branch (sven:2716) Bug#40257
View as plain text  
#At file:///home/sven/bzr/b40257-test_innodb_flag/6.0-rpl/

 2716 Sven Sandberg	2008-10-29 [merge]
      merged fix for BUG#40257 from 5.1-rpl to 6.0-rpl
removed:
  mysql-test/suite/rpl/t/rpl_auto_increment-slave.opt
  mysql-test/suite/rpl/t/rpl_bug26395-master.opt
  mysql-test/suite/rpl/t/rpl_bug26395-slave.opt
  mysql-test/suite/rpl/t/rpl_dual_pos_advance-slave.opt
  mysql-test/suite/rpl/t/rpl_extraCol_innodb-master.opt
  mysql-test/suite/rpl/t/rpl_extraCol_innodb-slave.opt
  mysql-test/suite/rpl/t/rpl_extraColmaster_innodb-master.opt
  mysql-test/suite/rpl/t/rpl_extraColmaster_innodb-slave.opt
  mysql-test/suite/rpl/t/rpl_foreign_key_innodb-slave.opt
  mysql-test/suite/rpl/t/rpl_idempotency-master.opt
  mysql-test/suite/rpl/t/rpl_insert_id-slave.opt
  mysql-test/suite/rpl/t/rpl_insert_id_pk-slave.opt
  mysql-test/suite/rpl/t/rpl_insert_ignore-slave.opt
  mysql-test/suite/rpl/t/rpl_invoked_features-master.opt
  mysql-test/suite/rpl/t/rpl_invoked_features-slave.opt
  mysql-test/suite/rpl/t/rpl_multi_engine-slave.opt
  mysql-test/suite/rpl/t/rpl_read_only-slave.opt
  mysql-test/suite/rpl/t/rpl_relay_space_innodb-master.opt
  mysql-test/suite/rpl/t/rpl_relay_space_innodb-slave.opt
  mysql-test/suite/rpl/t/rpl_row_basic_11bugs-slave.opt
  mysql-test/suite/rpl/t/rpl_row_basic_3innodb-slave.opt
  mysql-test/suite/rpl/t/rpl_row_blob_innodb-slave.opt
  mysql-test/suite/rpl/t/rpl_row_create_table-slave.opt
  mysql-test/suite/rpl/t/rpl_row_func003-slave.opt
  mysql-test/suite/rpl/t/rpl_row_log_innodb-slave.opt
  mysql-test/suite/rpl/t/rpl_row_sp002_innodb-master.opt
  mysql-test/suite/rpl/t/rpl_row_sp002_innodb-slave.opt
  mysql-test/suite/rpl/t/rpl_row_sp003-master.opt
  mysql-test/suite/rpl/t/rpl_row_sp003-slave.opt
  mysql-test/suite/rpl/t/rpl_row_sp006_InnoDB-slave.opt
  mysql-test/suite/rpl/t/rpl_row_sp007_innodb-slave.opt
  mysql-test/suite/rpl/t/rpl_row_tabledefs_3innodb-slave.opt
  mysql-test/suite/rpl/t/rpl_slave_grp_exec-master.opt
  mysql-test/suite/rpl/t/rpl_slave_grp_exec-slave.opt
  mysql-test/suite/rpl/t/rpl_slave_skip-slave.opt
  mysql-test/suite/rpl/t/rpl_stm_000001-slave.opt
modified:
  mysql-test/suite/rpl/r/rpl_innodb.result
  mysql-test/suite/rpl/r/rpl_innodb_mixed_ddl.result
  mysql-test/suite/rpl/rpl_1slave_base.cnf
  mysql-test/suite/rpl/t/rpl_deadlock_innodb-slave.opt
  mysql-test/suite/rpl/t/rpl_idempotency-slave.opt
  mysql-test/suite/rpl/t/rpl_innodb-master.opt
  mysql-test/suite/rpl/t/rpl_innodb.test
  mysql-test/suite/rpl/t/rpl_innodb_bug28430-master.opt
  mysql-test/suite/rpl/t/rpl_innodb_bug28430-slave.opt
  mysql-test/suite/rpl/t/rpl_relayrotate-slave.opt
  mysql-test/suite/rpl/t/rpl_row_basic_11bugs-master.opt

=== modified file 'mysql-test/suite/rpl/r/rpl_innodb.result'
--- a/mysql-test/suite/rpl/r/rpl_innodb.result	2007-12-12 17:19:24 +0000
+++ b/mysql-test/suite/rpl/r/rpl_innodb.result	2008-10-29 13:25:03 +0000
@@ -43,6 +43,7 @@ CREATE TEMPORARY TABLE mysqltest1.tmp (f
 CREATE TABLE mysqltest1.t1 (f1 BIGINT) ENGINE="InnoDB";
 SET AUTOCOMMIT = 0;
 -------- switch to slave --------
+ALTER TABLE mysqltest1.t1 ENGINE = MyISAM;
 SHOW CREATE TABLE mysqltest1.t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (

=== modified file 'mysql-test/suite/rpl/r/rpl_innodb_mixed_ddl.result'
--- a/mysql-test/suite/rpl/r/rpl_innodb_mixed_ddl.result	2007-06-29 17:09:00 +0000
+++ b/mysql-test/suite/rpl/r/rpl_innodb_mixed_ddl.result	2008-10-29 13:25:03 +0000
@@ -77,7 +77,7 @@ t1	CREATE TABLE `t1` (
   `b` char(254) DEFAULT NULL,
   PRIMARY KEY (`a`),
   KEY `index1` (`b`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
@@ -85,7 +85,7 @@ t2	CREATE TABLE `t2` (
   `b` char(254) DEFAULT NULL,
   PRIMARY KEY (`a`),
   KEY `index1` (`b`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
 
 ******************** DDL for indexes ********************
 ALTER TABLE t2 ADD COLUMN d datetime;
@@ -120,7 +120,7 @@ t1	CREATE TABLE `t1` (
   `b` char(254) DEFAULT NULL,
   PRIMARY KEY (`a`),
   KEY `index1` (`b`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
@@ -131,7 +131,7 @@ t2	CREATE TABLE `t2` (
   KEY `index1` (`b`),
   KEY `index2` (`d`),
   KEY `index3` (`a`,`d`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
 ALTER TABLE t2 DROP COLUMN d;
 
 

=== modified file 'mysql-test/suite/rpl/rpl_1slave_base.cnf'
--- a/mysql-test/suite/rpl/rpl_1slave_base.cnf	2007-12-19 10:08:41 +0000
+++ b/mysql-test/suite/rpl/rpl_1slave_base.cnf	2008-10-29 13:25:03 +0000
@@ -8,6 +8,8 @@
 
 log-bin=                 master-bin
 
+loose-innodb
+
 [mysqld.2]
 # Run the slave.sh script before starting this process
 #!run-slave-sh
@@ -39,7 +41,7 @@ slave-load-tmpdir=          ../../tmp
 
 rpl-recovery-rank=          @mysqld.2.server-id
 
-loose-skip-innodb
+loose-innodb
 
 
 [ENV]

=== removed file 'mysql-test/suite/rpl/t/rpl_auto_increment-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_auto_increment-slave.opt	2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/t/rpl_auto_increment-slave.opt	1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---loose-innodb

=== removed file 'mysql-test/suite/rpl/t/rpl_bug26395-master.opt'
--- a/mysql-test/suite/rpl/t/rpl_bug26395-master.opt	2008-07-06 10:53:25 +0000
+++ b/mysql-test/suite/rpl/t/rpl_bug26395-master.opt	1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---innodb

=== removed file 'mysql-test/suite/rpl/t/rpl_bug26395-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_bug26395-slave.opt	2008-07-06 10:53:25 +0000
+++ b/mysql-test/suite/rpl/t/rpl_bug26395-slave.opt	1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---innodb

=== modified file 'mysql-test/suite/rpl/t/rpl_deadlock_innodb-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_deadlock_innodb-slave.opt	2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/t/rpl_deadlock_innodb-slave.opt	2008-10-29 13:25:03 +0000
@@ -1 +1 @@
---innodb --innodb_lock_wait_timeout=4 --slave-transaction-retries=2 --max-relay-log-size=4096
+--innodb_lock_wait_timeout=4 --slave-transaction-retries=2 --max-relay-log-size=4096

=== removed file 'mysql-test/suite/rpl/t/rpl_dual_pos_advance-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_dual_pos_advance-slave.opt	2008-02-27 17:46:06 +0000
+++ b/mysql-test/suite/rpl/t/rpl_dual_pos_advance-slave.opt	1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---innodb

=== removed file 'mysql-test/suite/rpl/t/rpl_extraCol_innodb-master.opt'
--- a/mysql-test/suite/rpl/t/rpl_extraCol_innodb-master.opt	2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/t/rpl_extraCol_innodb-master.opt	1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---innodb

=== removed file 'mysql-test/suite/rpl/t/rpl_extraCol_innodb-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_extraCol_innodb-slave.opt	2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/t/rpl_extraCol_innodb-slave.opt	1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---innodb

=== removed file 'mysql-test/suite/rpl/t/rpl_extraColmaster_innodb-master.opt'
--- a/mysql-test/suite/rpl/t/rpl_extraColmaster_innodb-master.opt	2007-07-29 22:10:42 +0000
+++ b/mysql-test/suite/rpl/t/rpl_extraColmaster_innodb-master.opt	1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---innodb

=== removed file 'mysql-test/suite/rpl/t/rpl_extraColmaster_innodb-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_extraColmaster_innodb-slave.opt	2007-07-29 22:10:42 +0000
+++ b/mysql-test/suite/rpl/t/rpl_extraColmaster_innodb-slave.opt	1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
- --innodb

=== removed file 'mysql-test/suite/rpl/t/rpl_foreign_key_innodb-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_foreign_key_innodb-slave.opt	2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/t/rpl_foreign_key_innodb-slave.opt	1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---innodb

=== removed file 'mysql-test/suite/rpl/t/rpl_idempotency-master.opt'
--- a/mysql-test/suite/rpl/t/rpl_idempotency-master.opt	2007-12-12 10:14:59 +0000
+++ b/mysql-test/suite/rpl/t/rpl_idempotency-master.opt	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
---innodb
-

=== modified file 'mysql-test/suite/rpl/t/rpl_idempotency-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_idempotency-slave.opt	2007-12-12 10:14:59 +0000
+++ b/mysql-test/suite/rpl/t/rpl_idempotency-slave.opt	2008-10-29 13:25:03 +0000
@@ -1,2 +1 @@
---slave-exec-mode=IDEMPOTENT --innodb
-
+--slave-exec-mode=IDEMPOTENT

=== modified file 'mysql-test/suite/rpl/t/rpl_innodb-master.opt'
--- a/mysql-test/suite/rpl/t/rpl_innodb-master.opt	2007-09-08 18:19:35 +0000
+++ b/mysql-test/suite/rpl/t/rpl_innodb-master.opt	2008-10-29 13:25:03 +0000
@@ -1 +1 @@
---innodb --innodb_autoinc_lock_mode=0
+--innodb_autoinc_lock_mode=0

=== modified file 'mysql-test/suite/rpl/t/rpl_innodb.test'
--- a/mysql-test/suite/rpl/t/rpl_innodb.test	2007-12-12 17:19:24 +0000
+++ b/mysql-test/suite/rpl/t/rpl_innodb.test	2008-10-29 13:25:03 +0000
@@ -74,6 +74,17 @@ SET AUTOCOMMIT = 0;
 sync_slave_with_master;
 --echo -------- switch to slave --------
 connection slave;
+
+# We want to verify that the following transactions are written to the
+# binlog, despite the transaction is rolled back. (The should be
+# written to the binlog since they contain non-transactional DROP
+# TEMPORARY TABLE).  To see that, we use the auxiliary table t1, which
+# is transactional (InnoDB) on master and MyISAM on slave. t1 should
+# be transactional on master so that the insert into t1 does not cause
+# the transaction to be logged. Since t1 is non-transactional on
+# slave, the change will not be rolled back, so the inserted rows will
+# stay in t1 and we can verify that the transaction was replicated.
+ALTER TABLE mysqltest1.t1 ENGINE = MyISAM;
 SHOW CREATE TABLE mysqltest1.t1;
 
 --echo -------- switch to master --------
@@ -100,8 +111,7 @@ connection slave;
 SHOW CREATE TABLE mysqltest1.tmp;
 --error ER_NO_SUCH_TABLE
 SHOW CREATE TABLE mysqltest1.tmp2;
-# has two rows here : as the default is MyISAM and
-# it can't be rolled back by the master's ROLLBACK.
+# t1 has two rows here: the transaction not rolled back since t1 uses MyISAM
 SELECT COUNT(*) FROM mysqltest1.t1;
 FLUSH LOGS;
 

=== modified file 'mysql-test/suite/rpl/t/rpl_innodb_bug28430-master.opt'
--- a/mysql-test/suite/rpl/t/rpl_innodb_bug28430-master.opt	2007-09-08 18:19:35 +0000
+++ b/mysql-test/suite/rpl/t/rpl_innodb_bug28430-master.opt	2008-10-29 13:25:03 +0000
@@ -1 +1 @@
---innodb --innodb_autoinc_lock_mode=0
+--innodb_autoinc_lock_mode=0

=== modified file 'mysql-test/suite/rpl/t/rpl_innodb_bug28430-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_innodb_bug28430-slave.opt	2007-09-08 18:56:55 +0000
+++ b/mysql-test/suite/rpl/t/rpl_innodb_bug28430-slave.opt	2008-10-29 13:25:03 +0000
@@ -1 +1 @@
---innodb --innodb_autoinc_lock_mode=0
+--innodb_autoinc_lock_mode=0

=== removed file 'mysql-test/suite/rpl/t/rpl_insert_id-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_insert_id-slave.opt	2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/t/rpl_insert_id-slave.opt	1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---loose-innodb

=== removed file 'mysql-test/suite/rpl/t/rpl_insert_id_pk-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_insert_id_pk-slave.opt	2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/t/rpl_insert_id_pk-slave.opt	1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---loose-innodb

=== removed file 'mysql-test/suite/rpl/t/rpl_insert_ignore-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_insert_ignore-slave.opt	2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/t/rpl_insert_ignore-slave.opt	1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---loose-innodb

=== removed file 'mysql-test/suite/rpl/t/rpl_invoked_features-master.opt'
--- a/mysql-test/suite/rpl/t/rpl_invoked_features-master.opt	2007-06-27 14:49:32 +0000
+++ b/mysql-test/suite/rpl/t/rpl_invoked_features-master.opt	1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---innodb

=== removed file 'mysql-test/suite/rpl/t/rpl_invoked_features-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_invoked_features-slave.opt	2007-06-27 14:49:32 +0000
+++ b/mysql-test/suite/rpl/t/rpl_invoked_features-slave.opt	1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---innodb

=== removed file 'mysql-test/suite/rpl/t/rpl_multi_engine-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_multi_engine-slave.opt	2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/t/rpl_multi_engine-slave.opt	1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---loose-innodb

=== removed file 'mysql-test/suite/rpl/t/rpl_read_only-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_read_only-slave.opt	2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/t/rpl_read_only-slave.opt	1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---loose-innodb

=== removed file 'mysql-test/suite/rpl/t/rpl_relay_space_innodb-master.opt'
--- a/mysql-test/suite/rpl/t/rpl_relay_space_innodb-master.opt	2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/t/rpl_relay_space_innodb-master.opt	1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---innodb

=== removed file 'mysql-test/suite/rpl/t/rpl_relay_space_innodb-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_relay_space_innodb-slave.opt	2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/t/rpl_relay_space_innodb-slave.opt	1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---innodb

=== modified file 'mysql-test/suite/rpl/t/rpl_relayrotate-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_relayrotate-slave.opt	2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/t/rpl_relayrotate-slave.opt	2008-10-29 13:25:03 +0000
@@ -1,3 +1,2 @@
 -O max_relay_log_size=16384
---loose-innodb
 --log-warnings

=== modified file 'mysql-test/suite/rpl/t/rpl_row_basic_11bugs-master.opt'
--- a/mysql-test/suite/rpl/t/rpl_row_basic_11bugs-master.opt	2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/t/rpl_row_basic_11bugs-master.opt	2008-10-29 13:25:03 +0000
@@ -1,2 +1,2 @@
---binlog_ignore_db=test_ignore --loose-innodb
+--binlog_ignore_db=test_ignore
 

=== removed file 'mysql-test/suite/rpl/t/rpl_row_basic_11bugs-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_row_basic_11bugs-slave.opt	2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/t/rpl_row_basic_11bugs-slave.opt	1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---loose-innodb

=== removed file 'mysql-test/suite/rpl/t/rpl_row_basic_3innodb-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_row_basic_3innodb-slave.opt	2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/t/rpl_row_basic_3innodb-slave.opt	1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---innodb

=== removed file 'mysql-test/suite/rpl/t/rpl_row_blob_innodb-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_row_blob_innodb-slave.opt	2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/t/rpl_row_blob_innodb-slave.opt	1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---innodb

=== removed file 'mysql-test/suite/rpl/t/rpl_row_create_table-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_row_create_table-slave.opt	2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/t/rpl_row_create_table-slave.opt	1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---loose-innodb

=== removed file 'mysql-test/suite/rpl/t/rpl_row_func003-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_row_func003-slave.opt	2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/t/rpl_row_func003-slave.opt	1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---loose-innodb

=== removed file 'mysql-test/suite/rpl/t/rpl_row_log_innodb-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_row_log_innodb-slave.opt	2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/t/rpl_row_log_innodb-slave.opt	1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---innodb

=== removed file 'mysql-test/suite/rpl/t/rpl_row_sp002_innodb-master.opt'
--- a/mysql-test/suite/rpl/t/rpl_row_sp002_innodb-master.opt	2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/t/rpl_row_sp002_innodb-master.opt	1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---innodb

=== removed file 'mysql-test/suite/rpl/t/rpl_row_sp002_innodb-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_row_sp002_innodb-slave.opt	2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/t/rpl_row_sp002_innodb-slave.opt	1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---innodb

=== removed file 'mysql-test/suite/rpl/t/rpl_row_sp003-master.opt'
--- a/mysql-test/suite/rpl/t/rpl_row_sp003-master.opt	2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/t/rpl_row_sp003-master.opt	1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---loose-innodb

=== removed file 'mysql-test/suite/rpl/t/rpl_row_sp003-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_row_sp003-slave.opt	2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/t/rpl_row_sp003-slave.opt	1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---loose-innodb

=== removed file 'mysql-test/suite/rpl/t/rpl_row_sp006_InnoDB-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_row_sp006_InnoDB-slave.opt	2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/t/rpl_row_sp006_InnoDB-slave.opt	1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---innodb

=== removed file 'mysql-test/suite/rpl/t/rpl_row_sp007_innodb-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_row_sp007_innodb-slave.opt	2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/t/rpl_row_sp007_innodb-slave.opt	1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---innodb

=== removed file 'mysql-test/suite/rpl/t/rpl_row_tabledefs_3innodb-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_row_tabledefs_3innodb-slave.opt	2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/t/rpl_row_tabledefs_3innodb-slave.opt	1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---innodb

=== removed file 'mysql-test/suite/rpl/t/rpl_slave_grp_exec-master.opt'
--- a/mysql-test/suite/rpl/t/rpl_slave_grp_exec-master.opt	2008-04-20 12:32:08 +0000
+++ b/mysql-test/suite/rpl/t/rpl_slave_grp_exec-master.opt	1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---innodb

=== removed file 'mysql-test/suite/rpl/t/rpl_slave_grp_exec-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_slave_grp_exec-slave.opt	2008-04-20 12:32:08 +0000
+++ b/mysql-test/suite/rpl/t/rpl_slave_grp_exec-slave.opt	1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---innodb

=== removed file 'mysql-test/suite/rpl/t/rpl_slave_skip-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_slave_skip-slave.opt	2007-10-19 12:18:41 +0000
+++ b/mysql-test/suite/rpl/t/rpl_slave_skip-slave.opt	1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---innodb

=== removed file 'mysql-test/suite/rpl/t/rpl_stm_000001-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_stm_000001-slave.opt	2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/t/rpl_stm_000001-slave.opt	1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---loose-innodb

Thread
bzr commit into mysql-6.0-rpl branch (sven:2716) Bug#40257Sven Sandberg29 Oct