diff options
| author | Kristian Nielsen <knielsen@knielsen-hq.org> | 2015-09-02 10:40:34 +0200 |
|---|---|---|
| committer | Kristian Nielsen <knielsen@knielsen-hq.org> | 2015-09-02 10:40:34 +0200 |
| commit | 83c7b1e95b04fd65651c93db2bc3746a228fd34c (patch) | |
| tree | 373dd36269204740eded0880de3ca5eeae9c787a /mysql-test | |
| parent | 4b41e3c7f33714186c97a6cc2e6d3bb93b050c61 (diff) | |
| parent | 09bfaf3a13dabad936198633b968451c17d409b2 (diff) | |
| download | mariadb-git-83c7b1e95b04fd65651c93db2bc3746a228fd34c.tar.gz | |
Merge MDEV-8725 into 10.0
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/suite/rpl/r/rpl_parallel.result | 18 | ||||
| -rw-r--r-- | mysql-test/suite/rpl/t/rpl_parallel.test | 22 |
2 files changed, 40 insertions, 0 deletions
diff --git a/mysql-test/suite/rpl/r/rpl_parallel.result b/mysql-test/suite/rpl/r/rpl_parallel.result index de67f5f0610..81243bbba49 100644 --- a/mysql-test/suite/rpl/r/rpl_parallel.result +++ b/mysql-test/suite/rpl/r/rpl_parallel.result @@ -1689,6 +1689,24 @@ a b include/stop_slave.inc SET GLOBAL debug_dbug=@old_dbug; include/start_slave.inc +*** MDEV-8725: Assertion on ROLLBACK statement in the binary log *** +BEGIN; +INSERT INTO t2 VALUES (200); +INSERT INTO t1 VALUES (200); +INSERT INTO t2 VALUES (201); +ROLLBACK; +SELECT * FROM t1 WHERE a>=200 ORDER BY a; +a +200 +SELECT * FROM t2 WHERE a>=200 ORDER BY a; +a +include/save_master_gtid.inc +include/sync_with_master_gtid.inc +SELECT * FROM t1 WHERE a>=200 ORDER BY a; +a +200 +SELECT * FROM t2 WHERE a>=200 ORDER BY a; +a include/stop_slave.inc SET GLOBAL slave_parallel_threads=@old_parallel_threads; include/start_slave.inc diff --git a/mysql-test/suite/rpl/t/rpl_parallel.test b/mysql-test/suite/rpl/t/rpl_parallel.test index e70dcfa5bb0..01a46637f07 100644 --- a/mysql-test/suite/rpl/t/rpl_parallel.test +++ b/mysql-test/suite/rpl/t/rpl_parallel.test @@ -2369,6 +2369,28 @@ SET GLOBAL debug_dbug=@old_dbug; +--echo *** MDEV-8725: Assertion on ROLLBACK statement in the binary log *** +--connection server_1 +# Inject an event group terminated by ROLLBACK, by mixing MyISAM and InnoDB +# in a transaction. The bug was an assertion on the ROLLBACK due to +# mark_start_commit() being already called. +--disable_warnings +BEGIN; +INSERT INTO t2 VALUES (200); +INSERT INTO t1 VALUES (200); +INSERT INTO t2 VALUES (201); +ROLLBACK; +--enable_warnings +SELECT * FROM t1 WHERE a>=200 ORDER BY a; +SELECT * FROM t2 WHERE a>=200 ORDER BY a; +--source include/save_master_gtid.inc + +--connection server_2 +--source include/sync_with_master_gtid.inc +SELECT * FROM t1 WHERE a>=200 ORDER BY a; +SELECT * FROM t2 WHERE a>=200 ORDER BY a; + + # Clean up. --connection server_2 --source include/stop_slave.inc |