MW-373 Wait for wsrep_ready at startup when provider is loaded

Conflicts:
	mysql-test/include/kill_and_restart_mysqld.inc

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
 

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
 

mysql-test/include/wait_wsrep_ready.inc

+#
+# 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