diff options
author | Sergei Golubchik <serg@mariadb.org> | 2018-02-22 08:39:24 +0100 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2018-02-22 08:39:24 +0100 |
commit | 2daa00580096fc825dadcab7f04cfd5a8069927f (patch) | |
tree | fb6d7187b0289ad6ae95f60aa193bb39d25e46f8 /sql/partition_info.cc | |
parent | db0484f355dae8d3a4e4aab731522521e8ff976e (diff) | |
parent | 5d8ac1ece1687278cbc860e97eae9c7cc163ee73 (diff) | |
download | mariadb-git-2daa00580096fc825dadcab7f04cfd5a8069927f.tar.gz |
Merge branch '10.1' into 10.2
Diffstat (limited to 'sql/partition_info.cc')
-rw-r--r-- | sql/partition_info.cc | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/sql/partition_info.cc b/sql/partition_info.cc index d66f011e5d7..bddc66189e4 100644 --- a/sql/partition_info.cc +++ b/sql/partition_info.cc @@ -2383,23 +2383,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. @@ -2893,3 +2876,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; +} |