summaryrefslogtreecommitdiff
path: root/mysql-test/include/have_partition.inc
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2013-08-15 10:47:18 +0200
committerSergei Golubchik <sergii@pisem.net>2013-08-15 10:47:18 +0200
commit3462b6d3d29eebc246dbf8942baffd0ae5dd0b4f (patch)
tree4e9b2f4f4e54c72c57f140d7377f9a7b7647beff /mysql-test/include/have_partition.inc
parent18fc51f5a48191e0424a160f35c29764236b2047 (diff)
downloadmariadb-git-3462b6d3d29eebc246dbf8942baffd0ae5dd0b4f.tar.gz
fix tests that were relying on @@have_partitioning
sql/sql_partition_admin.cc: compilation failures w/o partitioning
Diffstat (limited to 'mysql-test/include/have_partition.inc')
-rw-r--r--mysql-test/include/have_partition.inc8
1 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/include/have_partition.inc b/mysql-test/include/have_partition.inc
index b45572ad31e..50dc98ac1ed 100644
--- a/mysql-test/include/have_partition.inc
+++ b/mysql-test/include/have_partition.inc
@@ -1,4 +1,4 @@
--- require r/have_partition.require
-disable_query_log;
-show variables like 'have_partitioning';
-enable_query_log;
+if (`SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.PLUGINS WHERE PLUGIN_NAME = 'partition' AND PLUGIN_STATUS='ACTIVE'`)
+{
+ --skip Test requires partitioning
+}