diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-12-20 12:51:57 +0200 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-12-20 12:51:57 +0200 |
| commit | 042f763268c0f209e7c12e0a6a72bb5d204dfe29 (patch) | |
| tree | 7ee15ab50af97cab4135f3712f95ac12fafc74c5 /sql/sql_yacc.yy | |
| parent | cb121a047b55403fe271570c928fd95ed64a1c8f (diff) | |
| parent | 924db8b4ed3f268cbe91a1734611f4dc2311c7be (diff) | |
| download | mariadb-git-042f763268c0f209e7c12e0a6a72bb5d204dfe29.tar.gz | |
Merge remote-tracking branch '5.5' into 10.0
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 5367bfa5d27..04c11ec04ef 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -5126,18 +5126,8 @@ opt_part_values: partition_info *part_info= lex->part_info; if (! lex->is_partition_management()) { - if (part_info->part_type == RANGE_PARTITION) - { - my_error(ER_PARTITION_REQUIRES_VALUES_ERROR, MYF(0), - "RANGE", "LESS THAN"); - MYSQL_YYABORT; - } - if (part_info->part_type == LIST_PARTITION) - { - my_error(ER_PARTITION_REQUIRES_VALUES_ERROR, MYF(0), - "LIST", "IN"); - MYSQL_YYABORT; - } + if (part_info->error_if_requires_values()) + MYSQL_YYABORT; } else part_info->part_type= HASH_PARTITION; |