fix

Author: voodam

plugin/keyring_vault/tests/mtr/innodb_online_alter_encryption-master.opt

@@ -1,4 +1,3 @@
-SET @@global.keyring_vault_config="MYSQLTEST_VARDIR/keyring_vault.conf";
 # restart:<hidden args>
 CREATE TABLE t1 (id INT NOT NULL PRIMARY KEY, a VARCHAR(255)) ENGINE=InnoDB ENCRYPTION='y';
 CREATE TABLE t2 (id INT NOT NULL PRIMARY KEY, a VARCHAR(255)) ENGINE=InnoDB;

plugin/keyring_vault/tests/mtr/innodb_online_alter_encryption.result

@@ -20,10 +20,7 @@ call mtr.add_suppression("keyring_vault initialization failure");
 call mtr.add_suppression("A message intended for a client cannot be sent there as no client-session is attached");
 --enable_query_log
 
---let $keyring_restart_param = restart: $KEYRING_VAULT_PLUGIN_OPT $KEYRING_VAULT_PLUGIN_EARLY_LOAD --loose-keyring_vault_config=$vault_conf_file --innodb-sort-buffer-size=64k --innodb_encrypt_online_alter_logs=ON
-
---replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
-eval SET @@global.keyring_vault_config="$vault_conf_file";
+--let $keyring_restart_param = restart: $KEYRING_VAULT_PLUGIN_OPT $KEYRING_VAULT_PLUGIN_EARLY_LOAD --keyring_vault_config=$vault_conf_file --innodb-sort-buffer-size=64k --innodb_encrypt_online_alter_logs=ON
 
 --source include/innodb_online_alter_encryption.inc
 

plugin/keyring_vault/tests/mtr/innodb_online_alter_encryption.test

@@ -1,4 +1,3 @@
-SET @@global.keyring_vault_config="MYSQLTEST_VARDIR/keyring_vault.conf";
 # restart:<hidden args>
 CREATE TABLE t1(id INT NOT NULL PRIMARY KEY AUTO_INCREMENT, credit_card VARCHAR(200), private VARCHAR(50)) ENGINE=InnoDB ENCRYPTION='y';
 SET DEBUG_SYNC= 'ddl_after_scan SIGNAL opened WAIT_FOR rotated';

plugin/keyring_vault/tests/mtr/innodb_row_log_encryption-master.opt

@@ -21,10 +21,7 @@ call mtr.add_suppression("keyring_vault initialization failure");
 call mtr.add_suppression("A message intended for a client cannot be sent there as no client-session is attached");
 --enable_query_log
 
---let $keyring_restart_param = restart: $KEYRING_VAULT_PLUGIN_OPT $KEYRING_VAULT_PLUGIN_EARLY_LOAD --loose-keyring_vault_config=$vault_conf_file --innodb-sort-buffer-size=64k --innodb_encrypt_online_alter_logs=ON
-
---replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
-eval SET @@global.keyring_vault_config="$vault_conf_file";
+--let $keyring_restart_param = restart: $KEYRING_VAULT_PLUGIN_OPT $KEYRING_VAULT_PLUGIN_EARLY_LOAD --keyring_vault_config=$vault_conf_file --innodb-sort-buffer-size=64k --innodb_encrypt_online_alter_logs=ON
 
 --source include/innodb_row_log_encryption.inc
 

plugin/keyring_vault/tests/mtr/innodb_row_log_encryption.result

@@ -1,8 +1,4 @@
-SET @@global.keyring_vault_config='MYSQLTEST_VARDIR/keyring_vault1.conf';
-ERROR HY000: Unknown system variable 'keyring_vault_config'
-INSTALL PLUGIN keyring_vault SONAME 'keyring_vault.so';
-Warnings:
-Warning	42000	keyring_vault initialization failure. Please check the server log.
+# restart:<hidden args>
 SET @@global.keyring_vault_config='MYSQLTEST_VARDIR/keyring_vault2.conf';
 SET @@global.keyring_vault_config='MYSQLTEST_VARDIR/keyring_vault1.conf';
 UNINSTALL PLUGIN keyring_vault;

plugin/keyring_vault/tests/mtr/innodb_row_log_encryption.test

@@ -35,12 +35,9 @@ call mtr.add_suppression("for being a mount point unsuccessful - skipped.");
 call mtr.add_suppression("for being a mount point successful - identified kv-v2 secret engine.");
 --enable_query_log
 
---replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
---error ER_UNKNOWN_SYSTEM_VARIABLE
-eval SET @@global.keyring_vault_config='$conf_file1';
-
---replace_regex /\.dll/.so/
-eval INSTALL PLUGIN keyring_vault SONAME '$KEYRING_VAULT_PLUGIN';
+--let $restart_parameters = restart: $KEYRING_VAULT_PLUGIN_OPT $KEYRING_VAULT_PLUGIN_EARLY_LOAD --keyring_vault_config=$conf_file1
+--let $do_not_echo_parameters = 1
+--source include/restart_mysqld.inc
 
 --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
 eval SET @@global.keyring_vault_config='$conf_file2';