summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2021-10-27 08:54:06 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2021-10-27 08:54:37 +0300
commit4b8340d89990a8105561888059ec6e3543bed41d (patch)
tree23e119ca75403e5b50b55cebf52d399601413694
parentd062b69037fd83123337d038508e55e00adbc3cd (diff)
downloadmariadb-git-4b8340d89990a8105561888059ec6e3543bed41d.tar.gz
Fix tests for PLUGIN_PARTITION=NO
-rw-r--r--mysql-test/suite/mariabackup/partition_partial.test1
-rw-r--r--mysql-test/t/sp.test1
-rw-r--r--storage/test_sql_discovery/mysql-test/sql_discovery/simple.test1
3 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/suite/mariabackup/partition_partial.test b/mysql-test/suite/mariabackup/partition_partial.test
index 8e288ec997f..7ccc42c036c 100644
--- a/mysql-test/suite/mariabackup/partition_partial.test
+++ b/mysql-test/suite/mariabackup/partition_partial.test
@@ -1,4 +1,5 @@
#--source include/innodb_page_size.inc
+--source include/have_partition.inc
# import partitioned table from table from partial backup
diff --git a/mysql-test/t/sp.test b/mysql-test/t/sp.test
index 0ef5e7d0b6e..40a1e873ab9 100644
--- a/mysql-test/t/sp.test
+++ b/mysql-test/t/sp.test
@@ -1,3 +1,4 @@
+--source include/have_partition.inc
#
# Basic stored PROCEDURE tests
#
diff --git a/storage/test_sql_discovery/mysql-test/sql_discovery/simple.test b/storage/test_sql_discovery/mysql-test/sql_discovery/simple.test
index 90eea753a38..a8c7ef9a6bb 100644
--- a/storage/test_sql_discovery/mysql-test/sql_discovery/simple.test
+++ b/storage/test_sql_discovery/mysql-test/sql_discovery/simple.test
@@ -29,6 +29,7 @@ show warnings;
set @@test_sql_discovery_statement='t1:create table t1 (a int primary key) partition by hash(id) partitions 2';
--error ER_SQL_DISCOVER_ERROR
select * from t1;
+--replace_result 1289 1290 "The 'partitioning' feature is disabled; you need MariaDB built with '--with-plugin-partition' to have it working" "The MariaDB server is running with the --skip-partition option so it cannot execute this statement"
show warnings;
set @@test_sql_discovery_statement='t1:create table t1 (a int) union=(t3,t4)';