diff options
| author | Alexander Barkov <bar@mariadb.com> | 2019-08-13 11:42:31 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2019-08-13 11:42:31 +0400 |
| commit | 95cdc1ca5f006965e1b0e53a8567f6dbb87e01a1 (patch) | |
| tree | 20f91c9dfc995df26363073737c34e8fe565bfe6 /sql/sql_yacc.yy | |
| parent | ae1d17f52de045b37e0894e1e6684a911a43696c (diff) | |
| parent | 43882e764d6867c6855b1ff057758a3f08b25c55 (diff) | |
| download | mariadb-git-95cdc1ca5f006965e1b0e53a8567f6dbb87e01a1.tar.gz | |
Merge commit '43882e764d6867c6855b1ff057758a3f08b25c55' into 10.4
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index c01bfd2ec52..bd4277e7fea 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -6985,7 +6985,12 @@ field_type_lob: Lex->charset=&my_charset_bin; $$.set(&type_handler_blob, $2); } - | BLOB_ORACLE_SYM opt_field_length opt_compressed + | BLOB_ORACLE_SYM field_length opt_compressed + { + Lex->charset=&my_charset_bin; + $$.set(&type_handler_blob, $2); + } + | BLOB_ORACLE_SYM opt_compressed { Lex->charset=&my_charset_bin; $$.set(&type_handler_long_blob); |