summaryrefslogtreecommitdiff
path: root/sql/sql_yacc.yy
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mariadb.com>2019-08-06 18:02:03 +0400
committerAlexander Barkov <bar@mariadb.com>2019-08-06 18:02:03 +0400
commita8def12e8a65cee915029de46d6e37b338ee9289 (patch)
tree4b0ca466bcf24c25a8d3d34a4a99a299c240ff88 /sql/sql_yacc.yy
parentf36c0189b15b7ba0bd2de187223fe59f2359186e (diff)
downloadmariadb-git-a8def12e8a65cee915029de46d6e37b338ee9289.tar.gz
MDEV-20263 sql_mode=ORACLE: BLOB(65535) should not translate to LONGBLOB
Diffstat (limited to 'sql/sql_yacc.yy')
-rw-r--r--sql/sql_yacc.yy7
1 files changed, 6 insertions, 1 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index f5aecf37ecc..d5e579e9df5 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -7086,7 +7086,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);