diff options
Diffstat (limited to 'mysql-test/suite/rpl/r/rpl_temporary_error2.result')
| -rw-r--r-- | mysql-test/suite/rpl/r/rpl_temporary_error2.result | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/mysql-test/suite/rpl/r/rpl_temporary_error2.result b/mysql-test/suite/rpl/r/rpl_temporary_error2.result index 7c7663b8824..7d60d467ec7 100644 --- a/mysql-test/suite/rpl/r/rpl_temporary_error2.result +++ b/mysql-test/suite/rpl/r/rpl_temporary_error2.result @@ -1,9 +1,12 @@ include/master-slave.inc [connection master] +call mtr.add_suppression("Deadlock found when trying to get lock; try restarting transaction"); *** Provoke a deadlock on the slave, check that transaction retry succeeds. *** +connection master; CREATE TABLE t1 (a INT PRIMARY KEY, b INT) ENGINE=InnoDB; CREATE TABLE t2 (a INT) ENGINE=InnoDB; INSERT INTO t1(a) VALUES (1), (2), (3), (4), (5); +connection slave; SELECT * FROM t1 ORDER BY a; a b 1 NULL @@ -14,15 +17,20 @@ a b SET sql_log_bin=0; ALTER TABLE t2 ENGINE=MyISAM; SET sql_log_bin=1; +connect con_temp1,127.0.0.1,root,,test,$SERVER_MYPORT_2,; +connection con_temp1; BEGIN; UPDATE t1 SET b=2 WHERE a=4; INSERT INTO t2 VALUES (2); DELETE FROM t2 WHERE a=2; +connection master; BEGIN; UPDATE t1 SET b=1 WHERE a=2; INSERT INTO t2 VALUES (1); UPDATE t1 SET b=1 WHERE a=4; COMMIT; +connection slave; +connection con_temp1; UPDATE t1 SET b=2 WHERE a=2; SELECT * FROM t1 WHERE a<10 ORDER BY a; a b @@ -34,6 +42,7 @@ a b ROLLBACK; Warnings: Warning 1196 Some non-transactional changed tables couldn't be rolled back +connection slave; SELECT * FROM t1 ORDER BY a; a b 1 NULL @@ -50,6 +59,7 @@ retries 1 Last_SQL_Errno = '0' Last_SQL_Error = '' +connection master; DROP TABLE t1; DROP TABLE t2; include/rpl_end.inc |