From a8d5f57e9a362aa7db4c4f178a2e3d4590a6b3d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Lindstr=C3=B6m?= Date: Thu, 23 Jul 2020 11:34:01 +0300 Subject: [PATCH] Fix test cases Changes to be committed: modified: mysql-test/suite/galera_3nodes/t/GCF-354.test modified: mysql-test/suite/galera_3nodes/t/inconsistency_shutdown.test --- mysql-test/suite/galera_3nodes/t/GCF-354.test | 9 +++++++++ .../suite/galera_3nodes/t/inconsistency_shutdown.test | 3 +++ 2 files changed, 12 insertions(+) diff --git a/mysql-test/suite/galera_3nodes/t/GCF-354.test b/mysql-test/suite/galera_3nodes/t/GCF-354.test index f48d9fbc72a..c428aee7732 100644 --- a/mysql-test/suite/galera_3nodes/t/GCF-354.test +++ b/mysql-test/suite/galera_3nodes/t/GCF-354.test @@ -9,6 +9,13 @@ DROP SCHEMA test; --connect node_3, 127.0.0.1, root, , test, $NODE_MYPORT_3 --connection node_3 + +# Save original auto_increment_offset values. +--let $node_1=node_1 +--let $node_2=node_2 +--let $node_3=node_3 +--source ../galera/include/auto_increment_offset_save.inc + SET wsrep_on=OFF; CREATE TABLE test.t1 (f1 INTEGER); # @@ -90,3 +97,5 @@ CALL mtr.add_suppression("Query apply failed"); CALL mtr.add_suppression("WSREP: Inconsistency detected: Inconsistent by consensus on .*"); CALL mtr.add_suppression("Plugin 'InnoDB' will be forced to shutdown"); +--source ../galera/include/auto_increment_offset_restore.inc + diff --git a/mysql-test/suite/galera_3nodes/t/inconsistency_shutdown.test b/mysql-test/suite/galera_3nodes/t/inconsistency_shutdown.test index 4ce485308a3..7add9f48cfc 100644 --- a/mysql-test/suite/galera_3nodes/t/inconsistency_shutdown.test +++ b/mysql-test/suite/galera_3nodes/t/inconsistency_shutdown.test @@ -5,6 +5,9 @@ --source include/galera_cluster.inc --source include/have_innodb.inc +--source include/have_debug.inc +--source include/have_debug_sync.inc +--source ../galera/include/galera_have_debug_sync.inc # Save original auto_increment_offset values. --let $node_1=node_1