diff options
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 32 |
1 files changed, 11 insertions, 21 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index b1510fb413e..c2739d1d2fa 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -6513,9 +6513,10 @@ field_type_lob: { $$.set(&type_handler_long_blob); } | LONG_SYM opt_binary { $$.set(&type_handler_medium_blob); } + | JSON_SYM opt_binary + { $$.set(&type_handler_blob); } ; - field_type_misc: ENUM '(' string_list ')' opt_binary { $$.set(&type_handler_enum); } @@ -6675,19 +6676,7 @@ serial_attribute: lex->last_field->flags|= PRI_KEY_FLAG | NOT_NULL_FLAG; lex->alter_info.flags|= Alter_info::ALTER_ADD_INDEX; } - | UNIQUE_SYM - { - LEX *lex=Lex; - lex->last_field->flags|= UNIQUE_KEY_FLAG; - lex->alter_info.flags|= Alter_info::ALTER_ADD_INDEX; - } - | UNIQUE_SYM KEY_SYM - { - LEX *lex=Lex; - lex->last_field->flags|= UNIQUE_KEY_FLAG; - lex->alter_info.flags|= Alter_info::ALTER_ADD_INDEX; - } - | COMMENT_SYM TEXT_STRING_sys { Lex->last_field->comment= $2; } + | vcol_attribute | IDENT_sys equal TEXT_STRING_sys { if ($3.length > ENGINE_OPTION_MAX_LENGTH) @@ -15036,8 +15025,9 @@ set_stmt_option_value_following_option_type_list: */ option_value_following_option_type | set_stmt_option_value_following_option_type_list ',' option_value_following_option_type + ; -// Start of option value list +/* Start of option value list */ start_option_value_list: option_value_no_option_type { @@ -15062,7 +15052,7 @@ start_option_value_list: ; -// Start of option value list, option_type was given +/* Start of option value list, option_type was given */ start_option_value_list_following_option_type: option_value_following_option_type { @@ -15077,13 +15067,13 @@ start_option_value_list_following_option_type: } ; -// Remainder of the option value list after first option value. +/* Remainder of the option value list after first option value. */ option_value_list_continued: /* empty */ | ',' option_value_list ; -// Repeating list of option values after first option value. +/* Repeating list of option values after first option value. */ option_value_list: { sp_create_assignment_lex(thd, yychar == YYEMPTY); @@ -15104,7 +15094,7 @@ option_value_list: } ; -// Wrapper around option values following the first option value in the stmt. +/* Wrapper around option values following the first option value in the stmt. */ option_value: option_type { @@ -15134,7 +15124,7 @@ opt_var_ident_type: | SESSION_SYM '.' { $$=OPT_SESSION; } ; -// Option values with preceding option_type. +/* Option values with preceding option_type. */ option_value_following_option_type: internal_variable_name equal set_expr_or_default { @@ -15158,7 +15148,7 @@ option_value_following_option_type: } ; -// Option values without preceding option_type. +/* Option values without preceding option_type. */ option_value_no_option_type: ident equal set_expr_or_default { |