summaryrefslogtreecommitdiff
path: root/mysql-test/suite/binlog_encryption
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2018-05-29 17:14:34 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2018-05-29 17:14:34 +0300
commit6f96ff7268dd20d6d3b61931c972e7a43c1efdff (patch)
treef49810f994fad2b5428546f3bd594a27af374997 /mysql-test/suite/binlog_encryption
parent7269c70821fb6999683f184bf8dad22d35a7ad96 (diff)
downloadmariadb-git-6f96ff7268dd20d6d3b61931c972e7a43c1efdff.tar.gz
Allow tests to work with cmake -DPLUGIN_PARTITION=NO
Diffstat (limited to 'mysql-test/suite/binlog_encryption')
-rw-r--r--mysql-test/suite/binlog_encryption/encrypted_master.test1
-rw-r--r--mysql-test/suite/binlog_encryption/encrypted_slave.test1
-rw-r--r--mysql-test/suite/binlog_encryption/testdata.opt1
3 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/suite/binlog_encryption/encrypted_master.test b/mysql-test/suite/binlog_encryption/encrypted_master.test
index 503a40443d2..f67e93ce815 100644
--- a/mysql-test/suite/binlog_encryption/encrypted_master.test
+++ b/mysql-test/suite/binlog_encryption/encrypted_master.test
@@ -18,6 +18,7 @@
# - with annotated events, default checksums and minimal binlog row image
#
+--source include/have_partition.inc
--source encryption_algorithms.inc
--source include/have_innodb.inc
--enable_connect_log
diff --git a/mysql-test/suite/binlog_encryption/encrypted_slave.test b/mysql-test/suite/binlog_encryption/encrypted_slave.test
index f5697d91779..94777957b92 100644
--- a/mysql-test/suite/binlog_encryption/encrypted_slave.test
+++ b/mysql-test/suite/binlog_encryption/encrypted_slave.test
@@ -9,6 +9,7 @@
# relay logs and binary logs are encrypted on slave.
#
+--source include/have_partition.inc
--source encryption_algorithms.inc
--source include/have_innodb.inc
diff --git a/mysql-test/suite/binlog_encryption/testdata.opt b/mysql-test/suite/binlog_encryption/testdata.opt
deleted file mode 100644
index b0c5b9c8188..00000000000
--- a/mysql-test/suite/binlog_encryption/testdata.opt
+++ /dev/null
@@ -1 +0,0 @@
---partition