diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-12-20 13:30:05 +0200 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-12-20 13:30:05 +0200 |
| commit | e3d89652e5fd314f03875a3d026490452b2a5986 (patch) | |
| tree | 9f4d60e4431933ba6e53feb3372c9297c8b8836c /sql/sql_partition.cc | |
| parent | 7bbc6c14d1e8fcf1f4737e0a5fcf6237fe18bd23 (diff) | |
| parent | 042f763268c0f209e7c12e0a6a72bb5d204dfe29 (diff) | |
| download | mariadb-git-e3d89652e5fd314f03875a3d026490452b2a5986.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to 'sql/sql_partition.cc')
| -rw-r--r-- | sql/sql_partition.cc | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc index 330892c16e9..941182dda53 100644 --- a/sql/sql_partition.cc +++ b/sql/sql_partition.cc @@ -4882,16 +4882,11 @@ uint prep_alter_part_table(THD *thd, TABLE *table, Alter_info *alter_info, my_error(ER_PARTITION_WRONG_VALUES_ERROR, MYF(0), "LIST", "IN"); } - else if (tab_part_info->part_type == RANGE_PARTITION) - { - my_error(ER_PARTITION_REQUIRES_VALUES_ERROR, MYF(0), - "RANGE", "LESS THAN"); - } else { - DBUG_ASSERT(tab_part_info->part_type == LIST_PARTITION); - my_error(ER_PARTITION_REQUIRES_VALUES_ERROR, MYF(0), - "LIST", "IN"); + DBUG_ASSERT(tab_part_info->part_type == RANGE_PARTITION || + tab_part_info->part_type == LIST_PARTITION); + (void) tab_part_info->error_if_requires_values(); } goto err; } |