Merge 10.10 into 10.11

4 files changed, 73 insertions, 6 deletions

diff --git a/mysql-test/include/have_gzip.inc b/mysql-test/include/have_gzip.inc
new file mode 100644
index 00000000000..09f282b73de
--- /dev/null
+++ b/mysql-test/include/have_gzip.inc
@@ -0,0 +1,6 @@
+--error 0,1,127
+--exec gzip --version > /dev/null 2> /dev/null
+if ($sys_errno)
+{
+  --skip Requires gzip executable
+}
diff --git a/mysql-test/include/maybe_versioning.combinations b/mysql-test/include/maybe_versioning.combinations
new file mode 100644
index 00000000000..246ad30ce7e
--- /dev/null
+++ b/mysql-test/include/maybe_versioning.combinations
@@ -0,0 +1,7 @@
+[orig]
+
+[vers]
+system_versioning_alter_history=keep
+
+[vers_trx]
+system_versioning_alter_history=keep
diff --git a/mysql-test/include/maybe_versioning.inc b/mysql-test/include/maybe_versioning.inc
new file mode 100644
index 00000000000..8a7d7dad44f
--- /dev/null
+++ b/mysql-test/include/maybe_versioning.inc
@@ -0,0 +1,47 @@
+# include file for test files that can be run with and without debug
+# having debug and non-debug tests.
+
+# If $modify_create_table is true CREATE statement must be evaluated with
+# $create_options that adds WITH SYSTEM VERSIONING to the statement. Otherwise
+# system versioning is added implicitly via debug options. The second variant
+# can easily be added to any test but works only for debug builds.
+
+if ($modify_create_table)
+{
+  if ($MTR_COMBINATION_VERS)
+  {
+    let $create_options= `select ' WITH SYSTEM VERSIONING'`;
+  }
+
+  if ($MTR_COMBINATION_VERS_TRX)
+  {
+    --skip Not tested
+  }
+}
+
+if (!$modify_create_table)
+{
+  let $have_debug=`select version() like '%debug%'`;
+
+  if ($MTR_COMBINATION_VERS)
+  {
+    if (!$have_debug)
+    {
+      --skip Requires debug
+    }
+    --disable_query_log
+    set debug_dbug="d,sysvers_force_trx,sysvers_hide";
+    --enable_query_log
+  }
+
+  if ($MTR_COMBINATION_VERS_TRX)
+  {
+    if (!$have_debug)
+    {
+      --skip Requires debug
+    }
+    --disable_query_log
+    set debug_dbug="d,sysvers_force,sysvers_hide";
+    --enable_query_log
+  }
+}
diff --git a/mysql-test/include/start_mysqld.inc b/mysql-test/include/start_mysqld.inc
index b4fe116fe86..6e448cb2efd 100644
--- a/mysql-test/include/start_mysqld.inc
+++ b/mysql-test/include/start_mysqld.inc
@@ -12,25 +12,32 @@ if (!$restart_noprint)
   --let $restart_noprint=0
 }
 
+--let $restart_cmd= restart
+
+if ($restart_bindir)
+{
+  --let $restart_cmd= restart_bindir $restart_bindir
+}
+
 if ($restart_parameters)
 {
-  --exec echo "restart: $restart_parameters" > $_expect_file_name
+  --exec echo "$restart_cmd: $restart_parameters" > $_expect_file_name
   if (!$restart_noprint)
   {
-    --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR $MYSQLTEST_VARDIR MYSQLTEST_VARDIR 
-    --exec echo "# restart: $restart_parameters"
+    --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+    --exec echo "# $restart_cmd: $restart_parameters"
   }
   if ($restart_noprint == 1)
   {
-    --exec echo "# restart: with restart_parameters"
+    --exec echo "# $restart_cmd: with restart_parameters"
   }
 }
 if (!$restart_parameters)
 {
-  --exec echo "restart" > $_expect_file_name
+  --exec echo "$restart_cmd" > $_expect_file_name
   if ($restart_noprint < 2)
   {
-    --exec echo "# restart"
+    --exec echo "# $restart_cmd"
   }
 }