Allow tests to work with cmake -DPLUGIN_PARTITION=NO

MariaDB · May 29, 2018 · 6f96ff7 · 6f96ff7
1 parent 7269c70
commit 6f96ff7
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 3 deletions.
diff --git 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
@@ -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
diff --git a/mysql-test/suite/mariabackup/lock_ddl_per_table.opt 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
@@ -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
diff --git 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
@@ -1 +1 @@
---innodb --loose-changed_page_bitmaps --innodb-file-format=Barracuda --innodb-sys-tables --partition
+--innodb --loose-changed_page_bitmaps --innodb-sys-tables