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

After-merge fix.

Browse Source
This commit is contained in:
Kristian Nielsen
2015-09-02 11:11:24 +02:00
parent ef82cb7c2c
commit 0671430252
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1745,21 +1745,21 @@ SET GLOBAL debug_dbug=@old_dbug;
include/start_slave.inc include/start_slave.inc
*** MDEV-8725: Assertion on ROLLBACK statement in the binary log *** *** MDEV-8725: Assertion on ROLLBACK statement in the binary log ***
BEGIN; BEGIN;
INSERT INTO t2 VALUES (200); INSERT INTO t2 VALUES (2000);
INSERT INTO t1 VALUES (200); INSERT INTO t1 VALUES (2000);
INSERT INTO t2 VALUES (201); INSERT INTO t2 VALUES (2001);
ROLLBACK; ROLLBACK;
SELECT * FROM t1 WHERE a>=200 ORDER BY a; SELECT * FROM t1 WHERE a>=2000 ORDER BY a;
a a
200 2000
SELECT * FROM t2 WHERE a>=200 ORDER BY a; SELECT * FROM t2 WHERE a>=2000 ORDER BY a;
a a
include/save_master_gtid.inc include/save_master_gtid.inc
include/sync_with_master_gtid.inc include/sync_with_master_gtid.inc
SELECT * FROM t1 WHERE a>=200 ORDER BY a; SELECT * FROM t1 WHERE a>=2000 ORDER BY a;
a a
200 2000
SELECT * FROM t2 WHERE a>=200 ORDER BY a; SELECT * FROM t2 WHERE a>=2000 ORDER BY a;
a a
include/stop_slave.inc include/stop_slave.inc
SET GLOBAL slave_parallel_threads=@old_parallel_threads; SET GLOBAL slave_parallel_threads=@old_parallel_threads;

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

@@ -2436,19 +2436,19 @@ SET GLOBAL debug_dbug=@old_dbug;
# mark_start_commit() being already called. # mark_start_commit() being already called.
--disable_warnings --disable_warnings
BEGIN; BEGIN;
INSERT INTO t2 VALUES (200); INSERT INTO t2 VALUES (2000);
INSERT INTO t1 VALUES (200); INSERT INTO t1 VALUES (2000);
INSERT INTO t2 VALUES (201); INSERT INTO t2 VALUES (2001);
ROLLBACK; ROLLBACK;
--enable_warnings --enable_warnings
SELECT * FROM t1 WHERE a>=200 ORDER BY a; SELECT * FROM t1 WHERE a>=2000 ORDER BY a;
SELECT * FROM t2 WHERE a>=200 ORDER BY a; SELECT * FROM t2 WHERE a>=2000 ORDER BY a;
--source include/save_master_gtid.inc --source include/save_master_gtid.inc
--connection server_2 --connection server_2
--source include/sync_with_master_gtid.inc --source include/sync_with_master_gtid.inc
SELECT * FROM t1 WHERE a>=200 ORDER BY a; SELECT * FROM t1 WHERE a>=2000 ORDER BY a;
SELECT * FROM t2 WHERE a>=200 ORDER BY a; SELECT * FROM t2 WHERE a>=2000 ORDER BY a;
# Clean up. # Clean up.