diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-04-10 17:43:18 +0300 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-04-10 17:43:18 +0300 |
| commit | 45e6d0aebf023acb50671f82b87e6de5d1e78f5e (patch) | |
| tree | c6079a18e158706a0a877d1b522ceb851d6055b5 /mysql-test/include | |
| parent | f5cb66fb97101bc0f17ff879025fd7146c032cbc (diff) | |
| parent | 2e91eb7547dfc7c9a999568bd8245832bbcfefaa (diff) | |
| download | mariadb-git-45e6d0aebf023acb50671f82b87e6de5d1e78f5e.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'mysql-test/include')
| -rw-r--r-- | mysql-test/include/start_mysqld.inc | 3 | ||||
| -rw-r--r-- | mysql-test/include/wait_until_connected_again.inc | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/mysql-test/include/start_mysqld.inc b/mysql-test/include/start_mysqld.inc index 04dff714d49..e31f26aad8c 100644 --- a/mysql-test/include/start_mysqld.inc +++ b/mysql-test/include/start_mysqld.inc @@ -16,9 +16,6 @@ if (!$restart_parameters) # Call script that will poll the server waiting for it to be back online again --source include/wait_until_connected_again.inc -# Wait for wsrep ---source include/wait_wsrep_ready.inc - # Turn off reconnect again --disable_reconnect diff --git a/mysql-test/include/wait_until_connected_again.inc b/mysql-test/include/wait_until_connected_again.inc index bdd99af2fc1..2e80ea2ed7d 100644 --- a/mysql-test/include/wait_until_connected_again.inc +++ b/mysql-test/include/wait_until_connected_again.inc @@ -23,3 +23,9 @@ while ($mysql_errno) } --enable_query_log --enable_result_log + +# WSREP: SHOW STATUS queries are allowed even if wsrep +# is not ready. Make sure wsrep is ready before +# returning from this script + +--source include/wait_wsrep_ready.inc |