Push for testing of encryption

mysql-test/include/have_innodb_encryption.inc

@@ -0,0 +1,7 @@
+#
+# Ensure we have innodb encryption incompiled
+
+if (`select count(*)=0 from information_schema.global_variables where variable_name="innodb_data_encryption_providertype"`)
+{
+  --skip Test requires InnoDB encryption.
+}

mysql-test/include/maria_verify_recovery.inc

@@ -78,6 +78,8 @@ let $mms_purpose=comparison;
 let $mms_compare_physically=$mms_compare_physically_save;
 while ($mms_table_to_use)
 {
+  # the size of the index file is different for with/without encryption
+  --replace_result 372 <SIZE> 394 <SIZE>
   eval check table $mms_tname$mms_table_to_use extended;
   --echo * testing that checksum after recovery is as expected
   let $new_checksum=`CHECKSUM TABLE $mms_tname$mms_table_to_use`;

mysql-test/include/not_encrypted.inc

@@ -0,0 +1,4 @@
+if (`select @@innodb_encrypt_tables = 1`)
+{
+  skip only without encryption;
+}

mysql-test/include/restart_mysqld.inc

@@ -19,7 +19,14 @@ if ($rpl_inited)
 shutdown_server 60;
 
 # Write file to make mysql-test-run.pl start up the server again
---exec echo "restart" > $_expect_file_name
+if ($restart_parameters)
+{
+  --exec echo "restart: $restart_parameters" > $_expect_file_name
+}
+if (!$restart_parameters)
+{
+  --exec echo "restart" > $_expect_file_name
+}
 
 # Turn on reconnect
 --enable_reconnect