hashicorp: unification of test code between CS and ES editions

plugin/hashicorp_key_management/mysql-test/vault/t/hashicorp_check_kv_version.test

@@ -17,7 +17,7 @@
 --source include/shutdown_mysqld.inc
 
 --let $LOG_FILE=$MYSQLTEST_VARDIR/log/vault.err
---error 0,1
+--error 0,1,2
 --remove_file $LOG_FILE
 
 --let $vault_defaults=--plugin-load-add=hashicorp_key_management --hashicorp_key_management=force --hashicorp-key-management-check-kv-version=on --hashicorp-key-management-token=$VAULT_TOKEN

plugin/hashicorp_key_management/mysql-test/vault/t/hashicorp_key_rotation_age.test

@@ -8,9 +8,9 @@ replace_result $VAULT_ADDR VAULT_ADDR;
 SHOW GLOBAL variables LIKE "hashicorp%";
 
 --echo # Restart the server with encryption
-let $default_parameters=--innodb-tablespaces-encryption --innodb_encrypt_tables=ON;
-let $restart_noprint=1;
-let $restart_parameters=$default_parameters;
+--let $default_parameters=--innodb-tablespaces-encryption --innodb_encrypt_tables=ON
+--let $restart_noprint=1
+--let $restart_parameters=$default_parameters
 --source include/restart_mysqld.inc
 
 CREATE TABLE t1 (f1 INT, f2 VARCHAR(256))engine=innodb;
@@ -28,7 +28,7 @@ INSERT INTO t33 VALUES (12345, '1234567890');
 
 --echo # Restart the server with encryption and rotate key age
 
-let $restart_parameters=$default_parameters --innodb_encryption_threads=5 --innodb_encryption_rotate_key_age=16384;
+--let $restart_parameters=$default_parameters --innodb_encryption_threads=5 --innodb_encryption_rotate_key_age=16384
 --source include/restart_mysqld.inc
 
 --echo # Wait until encryption threads have encrypted all tablespaces
@@ -44,7 +44,7 @@ SELECT NAME, CURRENT_KEY_VERSION FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCR
 
 --echo # Restart the server with innodb_encryption_rotate_key_age= 0
 
-let $restart_parameters=$default_parameters --innodb_encryption_threads=1 --innodb_encryption_rotate_key_age=0;
+--let $restart_parameters=$default_parameters --innodb_encryption_threads=1 --innodb_encryption_rotate_key_age=0
 --source include/restart_mysqld.inc
 
 create table t4 (f1 int not null)engine=innodb encrypted=NO;

plugin/hashicorp_key_management/mysql-test/vault/t/hashicorp_mariabackup.test

@@ -8,36 +8,36 @@
 CREATE TABLE t(i INT) ENGINE INNODB encrypted=yes encryption_key_id=1;
 INSERT INTO t VALUES(1);
 
-let $targetdir=$MYSQLTEST_VARDIR/tmp/backup;
+--let $targetdir=$MYSQLTEST_VARDIR/tmp/backup
 
---error 0,1
-rmdir $targetdir;
+--error 0,1,2
+--rmdir $targetdir
 
-echo # mariabackup backup;
+--echo # mariabackup backup
 
 --disable_result_log
-exec $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf --backup --target-dir=$targetdir;
+--exec $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf --backup --target-dir=$targetdir
 --enable_result_log
 
 INSERT INTO t VALUES(2);
 
-echo # mariabackup prepare;
+--echo # mariabackup prepare
 --disable_result_log
-exec $XTRABACKUP --prepare --target-dir=$targetdir;
+--exec $XTRABACKUP --prepare --target-dir=$targetdir
 
-let $_datadir= `SELECT @@datadir`;
-echo # shutdown server;
+--let $_datadir= `SELECT @@datadir`
+--echo # shutdown server
 --source include/shutdown_mysqld.inc
-echo # remove datadir;
-rmdir $_datadir;
-echo # mariabackup move back;
-exec $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf --copy-back --datadir=$_datadir --target-dir=$targetdir --parallel=2 --throttle=1;
+--echo # remove datadir
+--rmdir $_datadir
+--echo # mariabackup move back
+--exec $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf --copy-back --datadir=$_datadir --target-dir=$targetdir --parallel=2 --throttle=1
 --source include/start_mysqld.inc
 --enable_result_log
 
 SELECT * FROM t;
 DROP TABLE t;
 
-rmdir $targetdir;
+--rmdir $targetdir
 
 --source hashicorp_deinit.inc

plugin/hashicorp_key_management/mysql-test/vault/t/hashicorp_url_prefix.test

@@ -13,7 +13,7 @@
 --source include/shutdown_mysqld.inc
 
 --let $LOG_FILE=$MYSQLTEST_VARDIR/log/vault.err
---error 0,1
+--error 0,1,2
 --remove_file $LOG_FILE
 
 --let $vault_defaults=--plugin-load-add=hashicorp_key_management --hashicorp_key_management=force --hashicorp-key-management-check-kv-version=off --hashicorp-key-management-token=$VAULT_TOKEN