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

MDEV-13577 slave_parallel_mode=optimistic should not report the mode's specific temporary errors

Browse Source 
Revert 7bbe324fc1
Fix the bug differently (in log_event.cc)
Fix the test case to actually fail without the bug fix
This commit is contained in:
Sergei Golubchik
2018-06-20 10:45:57 +02:00
parent 44682962e3
commit bb24663f5a
8 changed files with 18 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/suite/rpl/r/rpl_parallel_optimistic.result
View File

@@ -1,6 +1,4 @@
include/rpl_init.inc [topology=1->2]
call mtr.add_suppression("Warning.*Deadlock found when trying to get lock; try restarting transaction");
call mtr.add_suppression("Warning.*mysqld: Can't find record in 't2'");
ALTER TABLE mysql.gtid_slave_pos ENGINE=InnoDB;
CREATE TABLE t1 (a int PRIMARY KEY, b INT) ENGINE=InnoDB;
SET @old_parallel_threads=@@GLOBAL.slave_parallel_threads;
@@ -549,6 +547,7 @@ DELETE FROM t1;
DELETE FROM t2;
include/save_master_gtid.inc
include/sync_with_master_gtid.inc
set global log_warnings=2;
BEGIN;
INSERT INTO t1 SET a=1;
SET @save.binlog_format=@@session.binlog_format;
@@ -567,6 +566,7 @@ DELETE FROM t2;
include/save_master_gtid.inc
include/sync_with_master_gtid.inc
include/stop_slave.inc
set global log_warnings=default;
SET GLOBAL slave_parallel_mode=@old_parallel_mode;
SET GLOBAL slave_parallel_threads=@old_parallel_threads;
include/start_slave.inc

7
mysql-test/suite/rpl/t/rpl_parallel_optimistic.test
View File

@@ -4,11 +4,6 @@
--let $rpl_topology=1->2
--source include/rpl_init.inc
--connection server_2
call mtr.add_suppression("Warning.*Deadlock found when trying to get lock; try restarting transaction");
# The following instruction is a part of the proof of MDEV-13577 fixes, below.
call mtr.add_suppression("Warning.*mysqld: Can't find record in 't2'");
--connection server_1
ALTER TABLE mysql.gtid_slave_pos ENGINE=InnoDB;
CREATE TABLE t1 (a int PRIMARY KEY, b INT) ENGINE=InnoDB;
@@ -500,6 +495,7 @@ DELETE FROM t2;
# The 1st of the following two trx:s a blocker on slave
--connection server_2
set global log_warnings=2;
BEGIN;
INSERT INTO t1 SET a=1;
@@ -546,6 +542,7 @@ DELETE FROM t2;
#
--connection server_2
--source include/stop_slave.inc
set global log_warnings=default;
SET GLOBAL slave_parallel_mode=@old_parallel_mode;
SET GLOBAL slave_parallel_threads=@old_parallel_threads;
--source include/start_slave.inc