database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Fix Merge Error

Browse Source
This commit is contained in:
Sachin Setiya
2017-08-23 16:49:42 +05:30
parent 0aeff8c36a
commit 5077cc0b1a
6 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mysql-test/include/wait_wsrep_ready.inc
View File

@ -8,7 +8,10 @@
if (`SELECT COUNT(*)=1 FROM INFORMATION_SCHEMA.PLUGINS WHERE PLUGIN_NAME = 'wsrep' AND PLUGIN_STATUS='ACTIVE'`)
{
--source include/galera_wait_ready.inc
if (`SELECT @@GLOBAL.WSREP_ON`)
{
--source include/galera_wait_ready.inc
}
}
--enable_query_log