diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2017-08-21 13:35:00 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2017-08-21 13:35:00 +0300 |
| commit | c23efc7d50530570e6c13207f3c76adcb9237346 (patch) | |
| tree | 7c57ca7a1dc61590019abb5608c2b19327f8ed7c /mysql-test/include | |
| parent | 06106c01481401b6d7ef4309391ca2f66242cc85 (diff) | |
| parent | f1af2114993f884b1a6dc34fb1d972ead08f1966 (diff) | |
| download | mariadb-git-c23efc7d50530570e6c13207f3c76adcb9237346.tar.gz | |
Merge remote-tracking branch 'origin/10.0-galera' into 10.1
Diffstat (limited to 'mysql-test/include')
| -rw-r--r-- | mysql-test/include/galera_cluster.inc | 2 | ||||
| -rw-r--r-- | mysql-test/include/restart_mysqld.inc | 3 | ||||
| -rw-r--r-- | mysql-test/include/start_mysqld.inc | 3 | ||||
| -rw-r--r-- | mysql-test/include/wait_wsrep_ready.inc | 15 |
4 files changed, 23 insertions, 0 deletions
diff --git a/mysql-test/include/galera_cluster.inc b/mysql-test/include/galera_cluster.inc index bc652225722..c1834c3c26f 100644 --- a/mysql-test/include/galera_cluster.inc +++ b/mysql-test/include/galera_cluster.inc @@ -8,3 +8,5 @@ --let $galera_cluster_size = 2 --source include/galera_init.inc + +--source include/have_innodb.inc diff --git a/mysql-test/include/restart_mysqld.inc b/mysql-test/include/restart_mysqld.inc index dcaf47c55a2..c817694e57a 100644 --- a/mysql-test/include/restart_mysqld.inc +++ b/mysql-test/include/restart_mysqld.inc @@ -50,6 +50,9 @@ 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/start_mysqld.inc b/mysql-test/include/start_mysqld.inc index e31f26aad8c..04dff714d49 100644 --- a/mysql-test/include/start_mysqld.inc +++ b/mysql-test/include/start_mysqld.inc @@ -16,6 +16,9 @@ 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_wsrep_ready.inc b/mysql-test/include/wait_wsrep_ready.inc new file mode 100644 index 00000000000..0e666afa33d --- /dev/null +++ b/mysql-test/include/wait_wsrep_ready.inc @@ -0,0 +1,15 @@ +# +# If the wsrep plugin is loaded, wait until the wsrep provider becomes +# ready for use. +# + +--disable_query_log +--disable_result_log + +if (`SELECT COUNT(*)=1 FROM INFORMATION_SCHEMA.PLUGINS WHERE PLUGIN_NAME = 'wsrep' AND PLUGIN_STATUS='ACTIVE'`) +{ + --source include/galera_wait_ready.inc +} + +--enable_query_log +--enable_result_log |