1 files changed, 14 insertions, 4 deletions
diff --git a/mysql-test/suite/rpl/t/rpl_innodb.test b/mysql-test/suite/rpl/t/rpl_innodb.test
index 30d40e19614..64a85d27c88 100644
--- a/mysql-test/suite/rpl/t/rpl_innodb.test
+++ b/mysql-test/suite/rpl/t/rpl_innodb.test
@@ -18,7 +18,7 @@ CREATE TABLE t4 (
 
 --disable_warnings
 LOAD DATA
-     INFILE '../std_data_ln/loaddata_pair.dat'  
+     INFILE '../../std_data/loaddata_pair.dat'  
      REPLACE INTO TABLE t4 
      (name,number);
 --enable_warnings
@@ -30,7 +30,7 @@ SELECT * FROM t4;
 connection master;
 --disable_warnings
 LOAD DATA
-     INFILE '../std_data_ln/loaddata_pair.dat'  
+     INFILE '../../std_data/loaddata_pair.dat'  
      REPLACE INTO TABLE t4
      (name,number);
 --enable_warnings
@@ -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;