diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-08-26 00:34:43 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-08-26 00:34:43 +0200 |
| commit | bb8e99fdc367a470c6195a2ae4c33f273fe55a25 (patch) | |
| tree | 3b3bcacec8faab66bf6756f20dff1e45462fdc1c /sql/sql_yacc.yy | |
| parent | add44e684cb9f1b46d1d5facdf6255360fa7b656 (diff) | |
| parent | c02d61bc11ee06b6043e6db9a15d00b9f40bce1f (diff) | |
| download | mariadb-git-bb8e99fdc367a470c6195a2ae4c33f273fe55a25.tar.gz | |
Merge branch 'bb-10.2-ext' into 10.3
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 70237264770..508e6461f81 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -1862,8 +1862,8 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize); procedure_list procedure_list2 procedure_item field_def handler opt_generated_always opt_ignore opt_column opt_restrict - grant revoke set lock unlock string_list field_options field_option - field_opt_list opt_binary table_lock_list table_lock + grant revoke set lock unlock string_list field_options + opt_binary table_lock_list table_lock ref_list opt_match_clause opt_on_update_delete use opt_delete_options opt_delete_option varchar nchar nvarchar opt_outer table_list table_name table_alias_ref_list table_alias_ref @@ -6496,8 +6496,11 @@ 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); } + | JSON_SYM + { + Lex->charset= &my_charset_utf8mb4_bin; + $$.set(&type_handler_long_blob); + } ; field_type_misc: @@ -6581,18 +6584,11 @@ precision: field_options: /* empty */ {} - | field_opt_list {} - ; - -field_opt_list: - field_opt_list field_option {} - | field_option {} - ; - -field_option: - SIGNED_SYM {} + | SIGNED_SYM {} | UNSIGNED { Lex->last_field->flags|= UNSIGNED_FLAG;} | ZEROFILL { Lex->last_field->flags|= UNSIGNED_FLAG | ZEROFILL_FLAG; } + | UNSIGNED ZEROFILL { Lex->last_field->flags|= UNSIGNED_FLAG | ZEROFILL_FLAG; } + | ZEROFILL UNSIGNED { Lex->last_field->flags|= UNSIGNED_FLAG | ZEROFILL_FLAG; } ; field_length: |