summaryrefslogtreecommitdiff
path: root/sql/sql_yacc.yy
diff options
context:
space:
mode:
authorVicențiu Ciorbaru <vicentiu@mariadb.org>2017-12-22 12:23:39 +0200
committerVicențiu Ciorbaru <vicentiu@mariadb.org>2017-12-22 12:23:39 +0200
commit985d2d393c285ecd4539cb579b680f7b91fdaa1a (patch)
tree8cabf6c09758c30df04de96ca98c7827d5665493 /sql/sql_yacc.yy
parenta76a2522ec4f8c069827e038997387a8b8eb3a3a (diff)
parent461cf3e5a3c2d346d75b1407b285f8daf9d01f67 (diff)
downloadmariadb-git-985d2d393c285ecd4539cb579b680f7b91fdaa1a.tar.gz
Merge remote-tracking branch 'origin/10.1' into 10.2
Diffstat (limited to 'sql/sql_yacc.yy')
-rw-r--r--sql/sql_yacc.yy8
1 files changed, 2 insertions, 6 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index 17e6904b635..3c324a34ee9 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -5208,12 +5208,8 @@ opt_part_values:
partition_info *part_info= lex->part_info;
if (! lex->is_partition_management())
{
- if (part_info->part_type == RANGE_PARTITION)
- my_yyabort_error((ER_PARTITION_REQUIRES_VALUES_ERROR, MYF(0),
- "RANGE", "LESS THAN"));
- if (part_info->part_type == LIST_PARTITION)
- my_yyabort_error((ER_PARTITION_REQUIRES_VALUES_ERROR, MYF(0),
- "LIST", "IN"));
+ if (part_info->error_if_requires_values())
+ MYSQL_YYABORT;
}
else
part_info->part_type= HASH_PARTITION;