database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-24 14:48:09 +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

18
mysql-test/suite/rpl/r/rpl_parallel.result
View File

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