Merge 10.2 into bb-10.2-ext

mysql-test/include/fail_start_mysqld.inc

@@ -0,0 +1,18 @@
+# ==== Usage ====
+#
+# [--let $restart_parameters= --innodb-force-recovery=0 --innodb-read-only=1]
+# [--let $mysqld_stub_cmd= $MYSQLD_LAST_CMD]
+# [--let $error_log= $MYSQLTEST_VARDIR/log/mysqld.1.err]
+# --source include/fail_restart_mysqld.inc
+
+# Evaluate the default of $error_log
+if (!$error_log)
+{
+  --let $error_log= $MYSQLTEST_VARDIR/log/mysqld.1.err
+}
+
+--error 1
+--exec $mysqld_stub_cmd $restart_parameters >> $error_log  2>&1
+
+# As the server is stopped
+--disable_reconnect

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

mysql-test/include/innodb_undo_tablespaces.combinations

@@ -0,0 +1,5 @@
+[undo0]
+innodb-undo-tablespaces=0
+
+[undo3]
+innodb-undo-tablespaces=3

mysql-test/include/innodb_undo_tablespaces.inc

@@ -0,0 +1,3 @@
+# The goal of including this file is to enable innodb_undo_tablespaces combinations
+# (see include/innodb_undo_tablespaces.combinations)
+

mysql-test/include/shutdown_mysqld.inc

@@ -1,3 +1,17 @@
+# ==== Usage ====
+#
+# [--let $shutdown_timeout= 30]
+# [--let $allow_rpl_inited= 1]
+# --source include/shutdown_mysqld.inc
+
+# The default value is empty
+--let $server_shutdown_timeout=
+
+if ($shutdown_timeout)
+{
+  --let $server_shutdown_timeout= $shutdown_timeout
+}
+
 # This is the first half of include/restart_mysqld.inc.
 if ($rpl_inited)
 {

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

@@ -0,0 +1,18 @@
+#
+# 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'`)
+{
+  if (`SELECT @@GLOBAL.WSREP_ON`)
+  {
+    --source include/galera_wait_ready.inc
+  }
+}
+
+--enable_query_log
+--enable_result_log