Merging with 5.1-rpl

mysql-test/suite/rpl/r/rpl_innodb.result

@@ -43,6 +43,7 @@ CREATE TEMPORARY TABLE mysqltest1.tmp (f1 BIGINT);
 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` (

mysql-test/suite/rpl/r/rpl_innodb_mixed_ddl.result

@@ -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;
 
 

mysql-test/suite/rpl/rpl_1slave_base.cnf

@@ -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]

mysql-test/suite/rpl/t/rpl_auto_increment-slave.opt

---loose-innodb

mysql-test/suite/rpl/t/rpl_bug26395-master.opt

---innodb

mysql-test/suite/rpl/t/rpl_bug26395-slave.opt

---innodb

mysql-test/suite/rpl/t/rpl_deadlock_innodb-slave.opt

---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

mysql-test/suite/rpl/t/rpl_dual_pos_advance-slave.opt

---innodb

mysql-test/suite/rpl/t/rpl_extraCol_innodb-master.opt

---innodb

mysql-test/suite/rpl/t/rpl_extraCol_innodb-slave.opt

---innodb

mysql-test/suite/rpl/t/rpl_extraColmaster_innodb-master.opt

---innodb

mysql-test/suite/rpl/t/rpl_extraColmaster_innodb-slave.opt

- --innodb

mysql-test/suite/rpl/t/rpl_foreign_key_innodb-slave.opt

---innodb

mysql-test/suite/rpl/t/rpl_idempotency-master.opt

---innodb
-

mysql-test/suite/rpl/t/rpl_idempotency-slave.opt

---slave-exec-mode=IDEMPOTENT --innodb
-
+--slave-exec-mode=IDEMPOTENT

mysql-test/suite/rpl/t/rpl_innodb-master.opt

---innodb --innodb_autoinc_lock_mode=0
+--innodb_autoinc_lock_mode=0

mysql-test/suite/rpl/t/rpl_innodb.test

@@ -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;
 

mysql-test/suite/rpl/t/rpl_innodb_bug28430-master.opt

---innodb --innodb_autoinc_lock_mode=0
+--innodb_autoinc_lock_mode=0

mysql-test/suite/rpl/t/rpl_innodb_bug28430-slave.opt

---innodb --innodb_autoinc_lock_mode=0
+--innodb_autoinc_lock_mode=0

mysql-test/suite/rpl/t/rpl_insert_id-slave.opt

---loose-innodb

mysql-test/suite/rpl/t/rpl_insert_id_pk-slave.opt

---loose-innodb

mysql-test/suite/rpl/t/rpl_insert_ignore-slave.opt

---loose-innodb

mysql-test/suite/rpl/t/rpl_invoked_features-master.opt

---innodb

mysql-test/suite/rpl/t/rpl_invoked_features-slave.opt

---innodb

mysql-test/suite/rpl/t/rpl_multi_engine-slave.opt

---loose-innodb

mysql-test/suite/rpl/t/rpl_read_only-slave.opt

---loose-innodb

mysql-test/suite/rpl/t/rpl_relay_space_innodb-master.opt

---innodb

mysql-test/suite/rpl/t/rpl_relay_space_innodb-slave.opt

---innodb

mysql-test/suite/rpl/t/rpl_relayrotate-slave.opt

 -O max_relay_log_size=16384
---loose-innodb
 --log-warnings

mysql-test/suite/rpl/t/rpl_row_basic_11bugs-master.opt

---binlog_ignore_db=test_ignore --loose-innodb
+--binlog_ignore_db=test_ignore
 

mysql-test/suite/rpl/t/rpl_row_basic_11bugs-slave.opt

---loose-innodb

mysql-test/suite/rpl/t/rpl_row_basic_3innodb-slave.opt

---innodb

mysql-test/suite/rpl/t/rpl_row_blob_innodb-slave.opt

---innodb

mysql-test/suite/rpl/t/rpl_row_create_table-slave.opt

---loose-innodb

mysql-test/suite/rpl/t/rpl_row_func003-slave.opt

---loose-innodb

mysql-test/suite/rpl/t/rpl_row_log_innodb-slave.opt

---innodb

mysql-test/suite/rpl/t/rpl_row_sp002_innodb-master.opt

---innodb

mysql-test/suite/rpl/t/rpl_row_sp002_innodb-slave.opt

---innodb

mysql-test/suite/rpl/t/rpl_row_sp003-master.opt

---loose-innodb

mysql-test/suite/rpl/t/rpl_row_sp003-slave.opt

---loose-innodb

mysql-test/suite/rpl/t/rpl_row_sp006_InnoDB-slave.opt

---innodb

mysql-test/suite/rpl/t/rpl_row_sp007_innodb-slave.opt

---innodb

mysql-test/suite/rpl/t/rpl_row_tabledefs_3innodb-slave.opt

---innodb

mysql-test/suite/rpl/t/rpl_slave_grp_exec-master.opt

---innodb

mysql-test/suite/rpl/t/rpl_slave_grp_exec-slave.opt

---innodb

mysql-test/suite/rpl/t/rpl_slave_skip-slave.opt

---innodb

mysql-test/suite/rpl/t/rpl_stm_000001-slave.opt

---loose-innodb