summaryrefslogtreecommitdiff
path: root/mysql-test/suite/wsrep/r
diff options
context:
space:
mode:
authorNirbhay Choubey <nirbhay@mariadb.com>2014-12-31 19:28:20 -0500
committerNirbhay Choubey <nirbhay@mariadb.com>2014-12-31 19:28:20 -0500
commit952b575272d47a48a1c55e83d3ff9a548857e564 (patch)
treef921dfb867b2ee55f3fc6899f6e668309fe6db51 /mysql-test/suite/wsrep/r
parenteda3db826f741b6cb62bb6903bd6b55a6aca4c3a (diff)
downloadmariadb-git-952b575272d47a48a1c55e83d3ff9a548857e564.tar.gz
MDEV-6832: ER_LOCK_WAIT_TIMEOUT on SHOW STATUSmariadb-galera-5.5.41
Synchronous read view should not be needed for SHOW commands.
Diffstat (limited to 'mysql-test/suite/wsrep/r')
-rw-r--r--mysql-test/suite/wsrep/r/mdev_6832.result11
-rw-r--r--mysql-test/suite/wsrep/r/variables.result1
2 files changed, 11 insertions, 1 deletions
diff --git a/mysql-test/suite/wsrep/r/mdev_6832.result b/mysql-test/suite/wsrep/r/mdev_6832.result
new file mode 100644
index 00000000000..43894a6ec49
--- /dev/null
+++ b/mysql-test/suite/wsrep/r/mdev_6832.result
@@ -0,0 +1,11 @@
+#
+# MDEV-6832: ER_LOCK_WAIT_TIMEOUT on SHOW STATUS
+#
+SHOW STATUS LIKE 'wsrep_ready';
+Variable_name Value
+wsrep_ready ON
+SHOW STATUS LIKE 'wsrep_ready';
+Variable_name Value
+wsrep_ready OFF
+SET @@global.wsrep_cluster_address='gcomm://';
+# End of test.
diff --git a/mysql-test/suite/wsrep/r/variables.result b/mysql-test/suite/wsrep/r/variables.result
index bbd969c735a..675cdf724cc 100644
--- a/mysql-test/suite/wsrep/r/variables.result
+++ b/mysql-test/suite/wsrep/r/variables.result
@@ -16,7 +16,6 @@ SET GLOBAL wsrep_provider=none;
#
# MDEV#6206: wsrep_slave_threads subtracts from max_connections
#
-call mtr.add_suppression("safe_mutex: Found wrong usage of mutex 'LOCK_wsrep_slave_threads' and 'LOCK_global_system_variables'");
call mtr.add_suppression("WSREP: Failed to get provider options");
SELECT @@global.wsrep_provider;
@@global.wsrep_provider