diff options
author | Sergei Golubchik <serg@mariadb.org> | 2022-05-18 10:30:47 +0200 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2022-05-18 10:30:47 +0200 |
commit | b2187662bcba12b66667bc0531727453b3b8a666 (patch) | |
tree | 5a7983713a99cbac9e645483125c8ef4fceb3fcb /mysql-test/suite/galera_3nodes | |
parent | 98ca71ab28fffbb65c4590cda904f1f0dfd975bb (diff) | |
parent | 7970ac7fe87d1da34e3e212dccd57b112b94b3fe (diff) | |
download | mariadb-git-b2187662bcba12b66667bc0531727453b3b8a666.tar.gz |
Merge branch '10.5' into 10.6mariadb-10.6.8
Diffstat (limited to 'mysql-test/suite/galera_3nodes')
-rw-r--r-- | mysql-test/suite/galera_3nodes/r/galera_wsrep_schema.result | 1 | ||||
-rw-r--r-- | mysql-test/suite/galera_3nodes/t/galera_wsrep_schema.test | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/mysql-test/suite/galera_3nodes/r/galera_wsrep_schema.result b/mysql-test/suite/galera_3nodes/r/galera_wsrep_schema.result index f51eb815cd5..deef311b1e4 100644 --- a/mysql-test/suite/galera_3nodes/r/galera_wsrep_schema.result +++ b/mysql-test/suite/galera_3nodes/r/galera_wsrep_schema.result @@ -74,3 +74,4 @@ cluster_uuid = (SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHER SELECT COUNT(*) AS EXPECT_3 FROM mysql.wsrep_cluster_members; EXPECT_3 3 +disconnect node_3; diff --git a/mysql-test/suite/galera_3nodes/t/galera_wsrep_schema.test b/mysql-test/suite/galera_3nodes/t/galera_wsrep_schema.test index 52bbf3a652c..d6e20d3bbfb 100644 --- a/mysql-test/suite/galera_3nodes/t/galera_wsrep_schema.test +++ b/mysql-test/suite/galera_3nodes/t/galera_wsrep_schema.test @@ -17,6 +17,9 @@ # Make the test fail if table structure has changed +--let $wait_condition = SELECT VARIABLE_VALUE = 3 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size'; +--source include/wait_condition.inc + SHOW CREATE TABLE mysql.wsrep_cluster; SHOW CREATE TABLE mysql.wsrep_cluster_members; @@ -74,3 +77,5 @@ SELECT cluster_uuid = (SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STAT SELECT COUNT(*) AS EXPECT_3 FROM mysql.wsrep_cluster_members; --source ../galera/include/auto_increment_offset_restore.inc + +--disconnect node_3 |