summaryrefslogtreecommitdiff
path: root/sql/partition_info.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2018-12-13 12:36:57 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2018-12-13 12:37:40 +0200
commit8e613458e1ad797b5e2c7870ffe1c3d5100dbbee (patch)
tree717025b43260173681f173ecc575f65bf3d9a187 /sql/partition_info.cc
parent5ab91f5914cd632a0615c071e38a1bfff4371303 (diff)
downloadmariadb-git-8e613458e1ad797b5e2c7870ffe1c3d5100dbbee.tar.gz
Fix cmake -DWITH_PARTITION_STORAGE_ENGINE:BOOL=OFF
This is a backport of a part of commit 18455ec3f1a9c22977f0ed87233852813b53eb49 from 10.1.
Diffstat (limited to 'sql/partition_info.cc')
-rw-r--r--sql/partition_info.cc33
1 files changed, 16 insertions, 17 deletions
diff --git a/sql/partition_info.cc b/sql/partition_info.cc
index 9d7d0d92686..e6a30c8a7f0 100644
--- a/sql/partition_info.cc
+++ b/sql/partition_info.cc
@@ -2748,23 +2748,6 @@ end:
}
-bool partition_info::error_if_requires_values() const
-{
- switch (part_type) {
- case NOT_A_PARTITION:
- case HASH_PARTITION:
- break;
- case RANGE_PARTITION:
- my_error(ER_PARTITION_REQUIRES_VALUES_ERROR, MYF(0), "RANGE", "LESS THAN");
- return true;
- case LIST_PARTITION:
- my_error(ER_PARTITION_REQUIRES_VALUES_ERROR, MYF(0), "LIST", "IN");
- return true;
- }
- return false;
-}
-
-
/**
Fix partition data from parser.
@@ -3232,3 +3215,19 @@ bool check_partition_dirs(partition_info *part_info)
}
#endif /* WITH_PARTITION_STORAGE_ENGINE */
+
+bool partition_info::error_if_requires_values() const
+{
+ switch (part_type) {
+ case NOT_A_PARTITION:
+ case HASH_PARTITION:
+ break;
+ case RANGE_PARTITION:
+ my_error(ER_PARTITION_REQUIRES_VALUES_ERROR, MYF(0), "RANGE", "LESS THAN");
+ return true;
+ case LIST_PARTITION:
+ my_error(ER_PARTITION_REQUIRES_VALUES_ERROR, MYF(0), "LIST", "IN");
+ return true;
+ }
+ return false;
+}