diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2020-08-19 08:52:32 +0300 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-09-04 07:53:00 +0200 |
| commit | cfd4ce919f77dde426533092b48b3bc683837eda (patch) | |
| tree | cec8b52df9304c90f7a21f2ef4a40bc5ced96dac | |
| parent | 080c2570728612e89bef3ec335ca8798aa8629ea (diff) | |
| download | mariadb-git-cfd4ce919f77dde426533092b48b3bc683837eda.tar.gz | |
Re-record result file and add suppression to stabilize test.
Changes to be committed:
modified: mysql-test/suite/galera/r/galera_bf_kill.result
modified: mysql-test/suite/galera_3nodes/r/GCF-354.result
modified: mysql-test/suite/galera_3nodes/t/GCF-354.test
| -rw-r--r-- | mysql-test/suite/galera/r/galera_bf_kill.result | 17 | ||||
| -rw-r--r-- | mysql-test/suite/galera_3nodes/r/GCF-354.result | 2 | ||||
| -rw-r--r-- | mysql-test/suite/galera_3nodes/t/GCF-354.test | 2 |
3 files changed, 4 insertions, 17 deletions
diff --git a/mysql-test/suite/galera/r/galera_bf_kill.result b/mysql-test/suite/galera/r/galera_bf_kill.result index 8c8cd8169fe..3738e8c9684 100644 --- a/mysql-test/suite/galera/r/galera_bf_kill.result +++ b/mysql-test/suite/galera/r/galera_bf_kill.result @@ -71,20 +71,3 @@ a b disconnect node_2a; connection node_1; drop table t1; -connect node_2a, 127.0.0.1, root, , test, $NODE_MYPORT_2; -connection node_2a; -CREATE TABLE t1 (i int primary key); -SET DEBUG_SYNC = "before_wsrep_ordered_commit SIGNAL bwoc_reached WAIT_FOR bwoc_continue"; -INSERT INTO t1 VALUES (1); -connection node_2; -SET DEBUG_SYNC = "now WAIT_FOR bwoc_reached"; -SET DEBUG_SYNC = "now SIGNAL bwoc_continue"; -SET DEBUG_SYNC='RESET'; -connection node_2a; -connection node_2; -select * from t1; -i -1 -disconnect node_2a; -connection node_2; -drop table t1; diff --git a/mysql-test/suite/galera_3nodes/r/GCF-354.result b/mysql-test/suite/galera_3nodes/r/GCF-354.result index dad57fe15ec..ebea1292077 100644 --- a/mysql-test/suite/galera_3nodes/r/GCF-354.result +++ b/mysql-test/suite/galera_3nodes/r/GCF-354.result @@ -47,9 +47,11 @@ CALL mtr.add_suppression("Slave SQL: Error 'Unknown database 'test'' on query. D 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"); +CALL mtr.add_suppression("WSREP: gcs/src/gcs_core.cpp:core_handle_uuid_msg():.*"); connection node_3; Node 3 synced CALL mtr.add_suppression("Slave SQL: Error 'Table 't1' already exists' on query. Default database: 'test'. Query: 'CREATE TABLE test.t1 \\\(f1 INTEGER\\\)', Error_code: 1050"); 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"); +CALL mtr.add_suppression("WSREP: gcs/src/gcs_core.cpp:core_handle_uuid_msg():.*"); diff --git a/mysql-test/suite/galera_3nodes/t/GCF-354.test b/mysql-test/suite/galera_3nodes/t/GCF-354.test index c428aee7732..d3b894005b9 100644 --- a/mysql-test/suite/galera_3nodes/t/GCF-354.test +++ b/mysql-test/suite/galera_3nodes/t/GCF-354.test @@ -87,6 +87,7 @@ CALL mtr.add_suppression("Slave SQL: Error 'Unknown database 'test'' on query. D 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"); +CALL mtr.add_suppression("WSREP: gcs/src/gcs_core.cpp:core_handle_uuid_msg():.*"); --connection node_3 --let $wait_condition = SELECT VARIABLE_VALUE = 'ON' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_ready' @@ -96,6 +97,7 @@ CALL mtr.add_suppression("Slave SQL: Error 'Table 't1' already exists' on query. 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"); +CALL mtr.add_suppression("WSREP: gcs/src/gcs_core.cpp:core_handle_uuid_msg():.*"); --source ../galera/include/auto_increment_offset_restore.inc |