database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-21 16:03:24 +03:00
Code Activity

Merge MDEV-8725 into 10.1

Browse Source
This commit is contained in:
Kristian Nielsen
2015-09-02 10:53:37 +02:00
parent 4f37a861c9 09bfaf3a13
commit ef82cb7c2c
4 changed files with 76 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
mysql-test/suite/rpl/t/rpl_parallel.test
View File

@@ -2429,6 +2429,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