diff options
| author | Alexander Barkov <bar@mariadb.com> | 2022-04-14 12:22:28 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2022-04-14 12:22:28 +0400 |
| commit | 83516a33a8397ba537b6e85f0a386ade73f2e8f7 (patch) | |
| tree | 314ee398767f44835dc91241f2d4d81efcdb8320 /sql | |
| parent | 9d734cdd61e4174589031431138bed2f85472a58 (diff) | |
| download | mariadb-git-83516a33a8397ba537b6e85f0a386ade73f2e8f7.tar.gz | |
An additional patch for MDEV-27690 Crash on `CHARACTER SET csname COLLATE DEFAULT` in column definition
Applying the fix to sql_yacc_ora.yy. Adding a test for sql_mode=ORACLE.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_yacc_ora.yy | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/sql/sql_yacc_ora.yy b/sql/sql_yacc_ora.yy index f0e6b5b54c7..ea7ba454d0b 100644 --- a/sql/sql_yacc_ora.yy +++ b/sql/sql_yacc_ora.yy @@ -1438,6 +1438,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, size_t *yystacksize); %type <charset> opt_collate + collate charset_name charset_or_alias charset_name_or_default @@ -7466,10 +7467,7 @@ charset_or_alias: } ; -collate: COLLATE_SYM collation_name_or_default - { - Lex->charset= $2; - } +collate: COLLATE_SYM collation_name_or_default { $$= $2; } ; opt_binary: @@ -7484,11 +7482,17 @@ binary: | BINARY charset_or_alias { bincmp_collation($2, true); } | charset_or_alias collate { - if (!my_charset_same(Lex->charset, $1)) - my_yyabort_error((ER_COLLATION_CHARSET_MISMATCH, MYF(0), - Lex->charset->name, $1->csname)); + if (!$2) + Lex->charset= $1; // CHARACTER SET cs COLLATE DEFAULT + else + { + if (!my_charset_same($2, $1)) + my_yyabort_error((ER_COLLATION_CHARSET_MISMATCH, MYF(0), + $2->name, $1->csname)); + Lex->charset= $2; + } } - | collate { } + | collate { Lex->charset= $1; } ; opt_bin_mod: |