summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorJan Lindström <jan.lindstrom@mariadb.com>2020-02-04 09:00:36 +0200
committerJan Lindström <jan.lindstrom@mariadb.com>2020-02-04 11:14:21 +0200
commit46386661a2311cabd7bac914c44b1af0b4746e07 (patch)
tree90317a3db130183e3e4e9c808b8c1a9a1e4b89a7 /mysql-test
parent93278ee8ad0798a042bd8141b646ff3a17a7383d (diff)
downloadmariadb-git-46386661a2311cabd7bac914c44b1af0b4746e07.tar.gz
MDEV-20625 : MariaDB asserting when enabling wsrep_onbb-10.4-MDEV-20625
We need to release global system variables mutex before doing wsrep_init to avoid race with next show status and we need to save wsrep_on value as it is changed on wsrep_init. Added test case.
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/suite/wsrep/r/MDEV-20625.result3
-rw-r--r--mysql-test/suite/wsrep/t/MDEV-20625.test1
2 files changed, 3 insertions, 1 deletions
diff --git a/mysql-test/suite/wsrep/r/MDEV-20625.result b/mysql-test/suite/wsrep/r/MDEV-20625.result
index cf48f163b77..3e2b621c8f9 100644
--- a/mysql-test/suite/wsrep/r/MDEV-20625.result
+++ b/mysql-test/suite/wsrep/r/MDEV-20625.result
@@ -1,4 +1,5 @@
SET GLOBAL wsrep_on=ON;
SHOW GLOBAL STATUS LIKE 'wsrep_cluster_size';
Variable_name Value
-wsrep_cluster_size 1
+wsrep_cluster_size 0
+SET GLOBAL wsrep_on=OFF;
diff --git a/mysql-test/suite/wsrep/t/MDEV-20625.test b/mysql-test/suite/wsrep/t/MDEV-20625.test
index 09092b454c3..2a537fe432e 100644
--- a/mysql-test/suite/wsrep/t/MDEV-20625.test
+++ b/mysql-test/suite/wsrep/t/MDEV-20625.test
@@ -7,3 +7,4 @@
SET GLOBAL wsrep_on=ON;
SHOW GLOBAL STATUS LIKE 'wsrep_cluster_size';
+SET GLOBAL wsrep_on=OFF;