mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-11 09:30:23 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch '10.2' into 10.3

Browse source
This commit is contained in:
Vicențiu Ciorbaru 2018-04-12 12:41:19 +03:00
commit 65eefcdc60
145 changed files with 1963 additions and 425 deletions
Download patch file Download diff file Expand all files Collapse all files

3
mysql-test/include/start_mysqld.inc
View file

@ -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

6
mysql-test/include/wait_until_connected_again.inc
View file

@ -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