From 47d1679ac69e96b201622bc0f5b3e5526ba571f2 Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <serg@mariadb.org>
Date: Tue, 6 Feb 2018 20:26:59 +0100
Subject: [PATCH] fix encryption.tempfiles to check that encrypt_tmp_files is
 ON

---
 mysql-test/suite/encryption/r/tempfiles.result | 3 +++
 mysql-test/suite/encryption/t/tempfiles.opt    | 1 +
 mysql-test/suite/encryption/t/tempfiles.test   | 2 ++
 3 files changed, 6 insertions(+)
 create mode 100644 mysql-test/suite/encryption/t/tempfiles.opt

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
 #