diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2015-05-28 07:52:27 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2015-05-28 07:52:27 +0300 |
| commit | 979c5049ef6fdd55c29fa5170a96c62d2a8a6823 (patch) | |
| tree | de3e4846dada4736dbbe2c64067d32b56c93f654 | |
| parent | ab5094beabb9cde484fdfa442965c79e44167e38 (diff) | |
| download | mariadb-git-979c5049ef6fdd55c29fa5170a96c62d2a8a6823.tar.gz | |
MDEV-8242: encryption.innodb_page_encryption_key_change fails in buildbot
Forgot that echo will also expand variables and path might be different.
| -rw-r--r-- | mysql-test/suite/encryption/r/innodb_page_encryption_key_change.result | 4 | ||||
| -rw-r--r-- | mysql-test/suite/encryption/t/innodb_page_encryption_key_change.test | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/suite/encryption/r/innodb_page_encryption_key_change.result b/mysql-test/suite/encryption/r/innodb_page_encryption_key_change.result index 7bc8f13dcc8..8817479006d 100644 --- a/mysql-test/suite/encryption/r/innodb_page_encryption_key_change.result +++ b/mysql-test/suite/encryption/r/innodb_page_encryption_key_change.result @@ -1,4 +1,4 @@ -# Restart mysqld --loose-file-key-management-filename=/home/jan/mysql/10.1-bugs/mysql-test/std_data/keys2.txt +# Restart mysqld --loose-file-key-management-filename=keys2.txt SET GLOBAL innodb_file_format = `Barracuda`; SET GLOBAL innodb_file_per_table = ON; create table innodb_normal(c1 bigint not null, b char(200)) engine=innodb; @@ -57,7 +57,7 @@ variable_value >= 0 SELECT variable_value >= 0 FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_num_pages_decrypted'; variable_value >= 0 1 -# Restart mysqld --loose-file-key-management-filename=/home/jan/mysql/10.1-bugs/mysql-test/std_data/keys3.txt +# Restart mysqld --loose-file-key-management-filename=keys3.txt select * from innodb_normal; c1 b 1 test1 diff --git a/mysql-test/suite/encryption/t/innodb_page_encryption_key_change.test b/mysql-test/suite/encryption/t/innodb_page_encryption_key_change.test index 8283cf38a6c..cfd792447cf 100644 --- a/mysql-test/suite/encryption/t/innodb_page_encryption_key_change.test +++ b/mysql-test/suite/encryption/t/innodb_page_encryption_key_change.test @@ -3,7 +3,7 @@ # embedded does not support restart -- source include/not_embedded.inc ---echo # Restart mysqld --loose-file-key-management-filename=$MYSQL_TEST_DIR/std_data/keys2.txt +--echo # Restart mysqld --loose-file-key-management-filename=keys2.txt -- let $restart_parameters=--loose-file-key-management-filename=$MYSQL_TEST_DIR/std_data/keys2.txt -- source include/restart_mysqld.inc @@ -46,7 +46,7 @@ select * from innodb_redundant; SELECT variable_value >= 0 FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_num_pages_encrypted'; SELECT variable_value >= 0 FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_num_pages_decrypted'; ---echo # Restart mysqld --loose-file-key-management-filename=$MYSQL_TEST_DIR/std_data/keys3.txt +--echo # Restart mysqld --loose-file-key-management-filename=keys3.txt -- let $restart_parameters=--loose-file-key-management-filename=$MYSQL_TEST_DIR/std_data/keys3.txt -- source include/restart_mysqld.inc |