revision-id: 003b5074167fb316e143fb0fa2c56a3c98c29abf (mariadb-10.2.22-22-g003b5074167) parent(s): f65f40bb35eb521cc08ca4b61e3bc4dc838ac25f 622e9e8a7a5e9babe1dd41e7499c20f396b6ebdf author: Jan Lindström committer: Jan Lindström timestamp: 2019-03-01 09:17:19 +0200 message: Merge remote-tracking branch 'origin/10.1' into 10.2 mysql-test/suite/galera/disabled.def | 1 - mysql-test/suite/galera/r/MW-388.result | 12 +++-------- mysql-test/suite/galera/r/MW-86-wait1.result | 11 ++-------- mysql-test/suite/galera/r/MW-86-wait8.result | 11 ++-------- mysql-test/suite/galera/r/galera_mdl_race.result | 15 ++++--------- .../galera/r/galera_query_cache_sync_wait.result | 25 ++++++---------------- mysql-test/suite/galera/t/MW-388.test | 10 ++++----- mysql-test/suite/galera/t/MW-86-wait1.test | 5 ++--- mysql-test/suite/galera/t/MW-86-wait8.test | 5 ++--- mysql-test/suite/galera/t/galera_mdl_race.test | 17 +++++---------- .../galera/t/galera_query_cache_sync_wait.test | 13 ++++++----- 11 files changed, 36 insertions(+), 89 deletions(-) diff --cc mysql-test/suite/galera/disabled.def index bcef3c2508b,b81c9a737ec..e6efd57fb29 --- a/mysql-test/suite/galera/disabled.def +++ b/mysql-test/suite/galera/disabled.def @@@ -23,15 -23,7 +23,14 @@@ galera_as_slave_replication_bundle : MD galera_ssl_upgrade : MDEV-13549 Galera test failures galera.MW-329 : wsrep_local_replays not stable MW-416 : MDEV-13549 Galera test failures - MW-388 : MDEV-13549 Galera test failures +galera.MW-44 : MDEV-15809 Test failure on galera.MW-44 +galera.galera_pc_ignore_sb : MDEV-15811 Test failure on galera_pc_ignore_sb +galera_kill_applier : race condition at the start of the test +galera_ist_progress: MDEV-15236 galera_ist_progress fails when trying to read transfer status +pxc-421: Lock timeout exceeded galera_sst_mysqldump_with_key : MDEV-16890 Galera test failure +galera.galera_kill_ddl : MDEV-17108 Test failure on galera.galera_kill_ddl +galera.galera_var_node_address : MDEV-17151 Galera test failure on galera.galera_var_node_address galera_gc_fc_limit : MDEV-17061 Test failure on galera.galera_gc_fc_limit galera_as_slave_replication_budle : MDEV-15785 Test case galera_as_slave_replication_bundle caused debug assertion galera_wan : MDEV-17259: Test failure on galera.galera_wan diff --cc mysql-test/suite/galera/r/MW-388.result index 7a8c2adafc1,141189e45c6..4b4b321c542 --- a/mysql-test/suite/galera/r/MW-388.result +++ b/mysql-test/suite/galera/r/MW-388.result @@@ -10,27 -9,16 +10,23 @@@ INSERT INTO t1 VALUES (1, 'node 1'),(2 INSERT INTO t1 VALUES (3, 'node 1'); END| SET GLOBAL wsrep_slave_threads = 2; - SET GLOBAL DEBUG = "d,sync.wsrep_apply_cb"; - Warnings: - Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead + SET GLOBAL debug_dbug = "d,sync.wsrep_apply_cb"; +connection node_2; INSERT INTO t1 VALUES (1, 'node 2');; +connect node_1a, 127.0.0.1, root, , test, $NODE_MYPORT_1; +connection node_1a; SET SESSION DEBUG_SYNC = "now WAIT_FOR sync.wsrep_apply_cb_reached"; +connection node_1; SET SESSION wsrep_sync_wait = 0; SET SESSION DEBUG_SYNC = 'wsrep_after_replication SIGNAL wsrep_after_replication_reached WAIT_FOR wsrep_after_replication_continue'; CALL insert_proc ();; +connection node_1a; SET SESSION DEBUG_SYNC = "now WAIT_FOR wsrep_after_replication_reached"; - SET GLOBAL DEBUG = ""; - Warnings: - Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead + SET GLOBAL debug_dbug = ""; SET DEBUG_SYNC = "now SIGNAL wsrep_after_replication_continue"; SET DEBUG_SYNC = "now SIGNAL signal.wsrep_apply_cb"; +connection node_2; +connection node_1; SELECT @errno = 1213; @errno = 1213 0 diff --cc mysql-test/suite/galera/r/MW-86-wait1.result index 00010eaedcb,88b6ca30884..85729c6462e --- a/mysql-test/suite/galera/r/MW-86-wait1.result +++ b/mysql-test/suite/galera/r/MW-86-wait1.result @@@ -3,13 -2,9 +3,11 @@@ SELECT @@debug_sync @@debug_sync ON - current signal: '' SET SESSION wsrep_sync_wait = 1; - SET GLOBAL debug = "+d,sync.wsrep_apply_cb"; - Warnings: - Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead + SET GLOBAL debug_dbug = "d,sync.wsrep_apply_cb"; +connection node_1; CREATE TABLE t_wait1 (f1 INTEGER) ENGINE=InnoDB; INSERT INTO t_wait1 VALUES (1); +connection node_2; SET SESSION debug_sync = "now WAIT_FOR sync.wsrep_apply_cb_reached"; SHOW BINARY LOGS; SHOW BINLOG EVENTS; diff --cc mysql-test/suite/galera/r/MW-86-wait8.result index 47e0ebc1342,d5aa5037676..d1341542ef7 --- a/mysql-test/suite/galera/r/MW-86-wait8.result +++ b/mysql-test/suite/galera/r/MW-86-wait8.result @@@ -3,13 -2,9 +3,11 @@@ SELECT @@debug_sync @@debug_sync ON - current signal: '' SET SESSION wsrep_sync_wait = 8; - SET GLOBAL debug = "+d,sync.wsrep_apply_cb"; - Warnings: - Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead + SET GLOBAL debug_dbug = "d,sync.wsrep_apply_cb"; +connection node_1; CREATE TABLE t_wait8 (f1 INTEGER) ENGINE=InnoDB; INSERT INTO t_wait8 VALUES (1); +connection node_2; SET GLOBAL wsrep_provider_options = "repl.causal_read_timeout=PT0.1S"; SET SESSION debug_sync = "now WAIT_FOR sync.wsrep_apply_cb_reached"; SHOW BINARY LOGS; diff --cc mysql-test/suite/galera/r/galera_mdl_race.result index 048b2c46a67,b48900669cf..639a84a286c --- a/mysql-test/suite/galera/r/galera_mdl_race.result +++ b/mysql-test/suite/galera/r/galera_mdl_race.result @@@ -1,29 -1,16 +1,22 @@@ - CREATE TABLE t1 (f1 INTEGER PRIMARY KEY, f2 CHAR(1)); - CREATE TABLE t2 (f1 INTEGER PRIMARY KEY, f2 CHAR(1)); + CREATE TABLE t1 (f1 INTEGER PRIMARY KEY, f2 CHAR(1)) engine=innodb; + CREATE TABLE t2 (f1 INTEGER PRIMARY KEY, f2 CHAR(1)) engine=innodb; INSERT INTO t1 VALUES (1, 'a'); INSERT INTO t1 VALUES (2, 'a'); +connection node_1; SET AUTOCOMMIT=ON; START TRANSACTION; UPDATE t1 SET f2 = 'b' WHERE f1 = 1; +connect node_1a, 127.0.0.1, root, , test, $NODE_MYPORT_1; +connection node_1a; LOCK TABLE t2 WRITE; +connection node_1; - SET GLOBAL DEBUG = "d,sync.wsrep_before_mdl_wait"; - Warnings: - Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead + SET @@debug_dbug = "d,sync.wsrep_before_mdl_wait"; SELECT * FROM t2;; -SET @@debug_dbug = "d,sync.wsrep_after_BF_victim_lock"; +connection node_1a; - SET GLOBAL DEBUG = "d,sync.wsrep_after_BF_victim_lock"; - Warnings: - Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead +connection node_2; UPDATE t1 SET f2 = 'c' WHERE f1 = 1; +connection node_1a; - SET GLOBAL DEBUG = ""; - Warnings: - Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead + SET @@debug_dbug = ""; SET DEBUG_SYNC = "now SIGNAL signal.wsrep_before_mdl_wait"; SET DEBUG_SYNC = "now SIGNAL signal.wsrep_after_BF_victim_lock"; UNLOCK TABLES; diff --cc mysql-test/suite/galera/r/galera_query_cache_sync_wait.result index 8c9cece9097,b1cceebb010..154f670cc79 --- a/mysql-test/suite/galera/r/galera_query_cache_sync_wait.result +++ b/mysql-test/suite/galera/r/galera_query_cache_sync_wait.result @@@ -1,39 -1,24 +1,31 @@@ CREATE TABLE t1 (id INT PRIMARY KEY AUTO_INCREMENT) ENGINE=InnoDB; INSERT INTO t1 VALUES (1); +connection node_2; SET GLOBAL wsrep_provider_options = "repl.causal_read_timeout=PT1S"; - SET GLOBAL DEBUG = "d,sync.wsrep_apply_cb"; - Warnings: - Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead + SET GLOBAL debug_dbug = "d,sync.wsrep_apply_cb"; SELECT MAX(id) FROM t1; MAX(id) 1 +connection node_1; INSERT INTO t1 VALUES (2); +connection node_2; SELECT MAX(id) FROM t1; ERROR HY000: Lock wait timeout exceeded; try restarting transaction - SET GLOBAL DEBUG = ""; - Warnings: - Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead + SET GLOBAL debug_dbug = ""; SET DEBUG_SYNC = "now SIGNAL signal.wsrep_apply_cb"; FLUSH QUERY CACHE; - SET GLOBAL DEBUG = "d,sync.wsrep_apply_cb"; - Warnings: - Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead + SET GLOBAL debug_dbug = "d,sync.wsrep_apply_cb"; SET DEBUG_SYNC = "RESET"; +connection node_1; INSERT INTO t1 VALUES (3); +connection node_2; SELECT MAX(id) FROM t1; ERROR HY000: Lock wait timeout exceeded; try restarting transaction - SET GLOBAL DEBUG = ""; - Warnings: - Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead + SET GLOBAL debug_dbug = ""; SET DEBUG_SYNC = "now SIGNAL signal.wsrep_apply_cb"; +connection node_1; INSERT INTO t1 VALUES (4); +connection node_2; SELECT MAX(id) FROM t1; MAX(id) 4 @@@ -44,20 -29,11 +36,15 @@@ MAX(id SELECT VARIABLE_VALUE = 1 FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME = 'Qcache_hits'; VARIABLE_VALUE = 1 1 - SET GLOBAL DEBUG = "d,sync.wsrep_apply_cb"; - Warnings: - Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead + SET GLOBAL debug_dbug = "d,sync.wsrep_apply_cb"; +connection node_1; INSERT INTO t1 VALUES (5); +connection node_2; SELECT MAX(id) FROM t1 ; - connect node_2a, 127.0.0.1, root, , test, $NODE_MYPORT_2; + SET GLOBAL debug_dbug = ""; +connection node_2a; - SET GLOBAL DEBUG = ""; - Warnings: - Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead SET DEBUG_SYNC = "now SIGNAL signal.wsrep_apply_cb"; +connection node_2; MAX(id) 5 SELECT VARIABLE_VALUE = 1 FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME = 'Qcache_hits';