diff options
author | vicentiu <vicentiu@mariadb.org> | 2017-01-06 17:09:59 +0200 |
---|---|---|
committer | vicentiu <vicentiu@mariadb.org> | 2017-01-06 17:09:59 +0200 |
commit | e9aed131ead9e102c8948ebadc421960399722d4 (patch) | |
tree | ae8f4ee4ee7f7e915121ff2c73c88c20781c45ed /sql/sql_yacc.yy | |
parent | e4978d26b79120c58706e57fc66e4de1ec4b230c (diff) | |
parent | ae1b3d1991b679bb38095711de27934d7683deda (diff) | |
download | mariadb-git-e9aed131ead9e102c8948ebadc421960399722d4.tar.gz |
Merge remote-tracking branch 'origin/5.5' into 10.0
Diffstat (limited to 'sql/sql_yacc.yy')
-rw-r--r-- | sql/sql_yacc.yy | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index bf354496433..aca579f0a98 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -5117,6 +5117,8 @@ part_name: { partition_info *part_info= Lex->part_info; partition_element *p_elem= part_info->curr_part_elem; + if (check_ident_length(&$1)) + MYSQL_YYABORT; p_elem->partition_name= $1.str; } ; @@ -5411,7 +5413,11 @@ sub_part_definition: sub_name: ident_or_text - { Lex->part_info->curr_part_elem->partition_name= $1.str; } + { + if (check_ident_length(&$1)) + MYSQL_YYABORT; + Lex->part_info->curr_part_elem->partition_name= $1.str; + } ; opt_part_options: |