From 832770842e85048bb56b99a1dd448dbda59593a8 Mon Sep 17 00:00:00 2001
From: Mats Kindahl <mats@sun.com>
Date: Fri, 5 Dec 2008 10:23:27 +0100
Subject: Bug #40116: Uncommited changes are replicated and stay on slave after
 rollback on master

Making test slightly more generic and robust.

mysql-test/suite/rpl/t/rpl_trigger.test:
  Adding code to check that InnoDB is available on slave as well.
  Making code slightly more generic.
---
 mysql-test/suite/rpl/t/rpl_trigger.test | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'mysql-test/suite/rpl/t')

diff --git a/mysql-test/suite/rpl/t/rpl_trigger.test b/mysql-test/suite/rpl/t/rpl_trigger.test
index 8e911178dcc..d63eafe56a7 100644
--- a/mysql-test/suite/rpl/t/rpl_trigger.test
+++ b/mysql-test/suite/rpl/t/rpl_trigger.test
@@ -480,8 +480,11 @@ sync_slave_with_master;
 # rollback on master
 #
 
+connection master;
 source include/master-slave-reset.inc;
 source include/have_innodb.inc;
+connection slave;
+source include/have_innodb.inc;
 
 connection master;
 create table t1 ( f int ) engine = innodb;
@@ -492,16 +495,15 @@ create trigger tr
 
 set autocommit = 0;
 insert into t1 values ( 1 );
+rollback;
 
-select * from t1;
-sync_slave_with_master;
-select * from t1;
+let $diff_table_1=master:test.t1;
+let $diff_table_2=slave:test.t1;
+--source include/diff_tables.inc
 
-connection master;
-rollback;
-select * from t1;
-sync_slave_with_master;
-select * from t1;
+let $diff_table_1=master:test.log;
+let $diff_table_2=slave:test.log;
+--source include/diff_tables.inc
 
 connection master;
 drop table t1, log;
-- 
cgit v1.2.1