summaryrefslogtreecommitdiff
path: root/mysql-test/suite/encryption
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2018-02-06 20:26:59 +0100
committerSergei Golubchik <serg@mariadb.org>2018-02-08 22:54:37 +0100
commit47d1679ac69e96b201622bc0f5b3e5526ba571f2 (patch)
tree349b95db38a9c50b14ea9841800e6ad437314d96 /mysql-test/suite/encryption
parent06d77eb43a5f1e5bc24555e51d19d209d2b92615 (diff)
downloadmariadb-git-47d1679ac69e96b201622bc0f5b3e5526ba571f2.tar.gz
fix encryption.tempfiles to check that encrypt_tmp_files is ON
Diffstat (limited to 'mysql-test/suite/encryption')
-rw-r--r--mysql-test/suite/encryption/r/tempfiles.result3
-rw-r--r--mysql-test/suite/encryption/t/tempfiles.opt1
-rw-r--r--mysql-test/suite/encryption/t/tempfiles.test2
3 files changed, 6 insertions, 0 deletions
diff --git a/mysql-test/suite/encryption/r/tempfiles.result b/mysql-test/suite/encryption/r/tempfiles.result
index a0b7596dd5a..168f79b60e9 100644
--- a/mysql-test/suite/encryption/r/tempfiles.result
+++ b/mysql-test/suite/encryption/r/tempfiles.result
@@ -1,3 +1,6 @@
+select @@encrypt_tmp_files;
+@@encrypt_tmp_files
+1
CREATE TABLE t1(a INT);
INSERT INTO t1 VALUES(1),(2);
DELETE FROM t1 WHERE a=1;
diff --git a/mysql-test/suite/encryption/t/tempfiles.opt b/mysql-test/suite/encryption/t/tempfiles.opt
new file mode 100644
index 00000000000..2b90f474428
--- /dev/null
+++ b/mysql-test/suite/encryption/t/tempfiles.opt
@@ -0,0 +1 @@
+--encrypt-tmp-files
diff --git a/mysql-test/suite/encryption/t/tempfiles.test b/mysql-test/suite/encryption/t/tempfiles.test
index 34dcbdf5963..fc718f4d2ab 100644
--- a/mysql-test/suite/encryption/t/tempfiles.test
+++ b/mysql-test/suite/encryption/t/tempfiles.test
@@ -11,6 +11,8 @@ source include/have_binlog_format_row.inc;
# engine. But there's no need to run it twice for InnoDB and XtraDB.
source include/have_xtradb.inc;
+select @@encrypt_tmp_files;
+
#
# MyISAM messing around with IO_CACHE::file
#