From 6f96ff7268dd20d6d3b61931c972e7a43c1efdff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= <marko.makela@mariadb.com>
Date: Tue, 29 May 2018 17:14:34 +0300
Subject: [PATCH] Allow tests to work with cmake -DPLUGIN_PARTITION=NO

---
 mysql-test/suite/binlog_encryption/encrypted_master.test | 1 +
 mysql-test/suite/binlog_encryption/encrypted_slave.test  | 1 +
 mysql-test/suite/binlog_encryption/testdata.opt          | 1 -
 mysql-test/suite/mariabackup/lock_ddl_per_table.opt      | 1 +
 mysql-test/suite/mariabackup/lock_ddl_per_table.test     | 1 +
 mysql-test/suite/mariabackup/partition_datadir.opt       | 1 -
 mysql-test/suite/mariabackup/partition_datadir.test      | 1 +
 mysql-test/suite/mariabackup/suite.opt                   | 2 +-
 8 files changed, 6 insertions(+), 3 deletions(-)
 delete mode 100644 mysql-test/suite/binlog_encryption/testdata.opt
 create mode 100644 mysql-test/suite/mariabackup/lock_ddl_per_table.opt
 delete mode 100644 mysql-test/suite/mariabackup/partition_datadir.opt

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
diff --git a/mysql-test/suite/mariabackup/lock_ddl_per_table.opt b/mysql-test/suite/mariabackup/lock_ddl_per_table.opt
new file mode 100644
index 00000000000..bbb6d7f9ff4
--- /dev/null
+++ b/mysql-test/suite/mariabackup/lock_ddl_per_table.opt
@@ -0,0 +1 @@
+--loose-partition
diff --git a/mysql-test/suite/mariabackup/lock_ddl_per_table.test b/mysql-test/suite/mariabackup/lock_ddl_per_table.test
index 04edb9e05e9..2689508e554 100644
--- a/mysql-test/suite/mariabackup/lock_ddl_per_table.test
+++ b/mysql-test/suite/mariabackup/lock_ddl_per_table.test
@@ -1,4 +1,5 @@
 --source include/have_debug.inc
+--source include/have_partition.inc
 
 CREATE TABLE t(i INT) ENGINE INNODB;
 INSERT INTO t VALUES(1);
diff --git a/mysql-test/suite/mariabackup/partition_datadir.opt b/mysql-test/suite/mariabackup/partition_datadir.opt
deleted file mode 100644
index 8a3240370eb..00000000000
--- a/mysql-test/suite/mariabackup/partition_datadir.opt
+++ /dev/null
@@ -1 +0,0 @@
---partition
\ No newline at end of file
diff --git a/mysql-test/suite/mariabackup/partition_datadir.test b/mysql-test/suite/mariabackup/partition_datadir.test
index 882b0111267..c525d34a02c 100644
--- a/mysql-test/suite/mariabackup/partition_datadir.test
+++ b/mysql-test/suite/mariabackup/partition_datadir.test
@@ -1,3 +1,4 @@
+--source include/have_partition.inc
 let $targetdir=$MYSQLTEST_VARDIR/backup;
 mkdir $targetdir;
 mkdir $MYSQLTEST_VARDIR/partitdata;
diff --git a/mysql-test/suite/mariabackup/suite.opt b/mysql-test/suite/mariabackup/suite.opt
index 8b1e9c7bcb2..3b5cc4f4c45 100644
--- a/mysql-test/suite/mariabackup/suite.opt
+++ b/mysql-test/suite/mariabackup/suite.opt
@@ -1 +1 @@
---innodb --loose-changed_page_bitmaps --innodb-file-format=Barracuda --innodb-sys-tables --partition
\ No newline at end of file
+--innodb --loose-changed_page_bitmaps --innodb-sys-tables