database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

MDEV-20263 sql_mode=ORACLE: BLOB(65535) should not translate to LONGBLOB

Browse Source
This commit is contained in:
Alexander Barkov
2019-08-06 18:02:03 +04:00
parent f36c0189b1
commit a8def12e8a
7 changed files with 51 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/suite/compat/oracle/r/column_compression.result
View File

@ -515,7 +515,7 @@ CREATE TABLE t1 (a TEXT COMPRESSED BYTE);
SHOW CREATE TABLE t1; SHOW CREATE TABLE t1;
Table Create Table Table Create Table
t1 CREATE TABLE "t1" ( t1 CREATE TABLE "t1" (
"a" blob /*!100301 COMPRESSED*/ DEFAULT NULL "a" blob(65535) /*!100301 COMPRESSED*/ DEFAULT NULL
) )
DROP TABLE t1; DROP TABLE t1;
CREATE TABLE t1 (a TEXT COMPRESSED ASCII); CREATE TABLE t1 (a TEXT COMPRESSED ASCII);
@ -547,7 +547,7 @@ CREATE TABLE t1 (a TEXT COMPRESSED BYTE DEFAULT '');
SHOW CREATE TABLE t1; SHOW CREATE TABLE t1;
Table Create Table Table Create Table
t1 CREATE TABLE "t1" ( t1 CREATE TABLE "t1" (
"a" blob /*!100301 COMPRESSED*/ DEFAULT '' "a" blob(65535) /*!100301 COMPRESSED*/ DEFAULT ''
) )
DROP TABLE t1; DROP TABLE t1;
CREATE TABLE t1 (a TEXT COMPRESSED BINARY DEFAULT ''); CREATE TABLE t1 (a TEXT COMPRESSED BINARY DEFAULT '');
@ -605,7 +605,7 @@ Warning 1287 '<data type> <character set clause> ... COMPRESSED...' is deprecate
SHOW CREATE TABLE t1; SHOW CREATE TABLE t1;
Table Create Table Table Create Table
t1 CREATE TABLE "t1" ( t1 CREATE TABLE "t1" (
"a" blob /*!100301 COMPRESSED*/ DEFAULT NULL "a" blob(65535) /*!100301 COMPRESSED*/ DEFAULT NULL
) )
DROP TABLE t1; DROP TABLE t1;
# #

2
mysql-test/suite/compat/oracle/r/sp.result
View File

@ -2072,7 +2072,7 @@ t1 CREATE TABLE "t1" (
"tables_table_name" varchar(64) CHARACTER SET utf8 DEFAULT NULL, "tables_table_name" varchar(64) CHARACTER SET utf8 DEFAULT NULL,
"tables_table_rows" bigint(21) unsigned DEFAULT NULL, "tables_table_rows" bigint(21) unsigned DEFAULT NULL,
"processlist_info" longtext CHARACTER SET utf8 DEFAULT NULL, "processlist_info" longtext CHARACTER SET utf8 DEFAULT NULL,
"processlist_info_binary" blob DEFAULT NULL "processlist_info_binary" blob(65535) DEFAULT NULL
) )
DROP TABLE t1; DROP TABLE t1;
DROP PROCEDURE p1; DROP PROCEDURE p1;

18
mysql-test/suite/compat/oracle/r/type_blob.result
View File

@ -6,3 +6,21 @@ t1 CREATE TABLE "t1" (
"a" longblob DEFAULT NULL "a" longblob DEFAULT NULL
) )
DROP TABLE t1; DROP TABLE t1;
#
# MDEV-20263 sql_mode=ORACLE: BLOB(65535) should not translate to LONGBLOB
#
CREATE TABLE t1 (
c1 BLOB(100),
c2 BLOB(65535),
c3 BLOB(16777215),
c4 BLOB(16777216)
);
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE "t1" (
"c1" tinyblob DEFAULT NULL,
"c2" blob(65535) DEFAULT NULL,
"c3" mediumblob DEFAULT NULL,
"c4" longblob DEFAULT NULL
)
DROP TABLE t1;

13
mysql-test/suite/compat/oracle/t/type_blob.test
View File

@ -2,3 +2,16 @@ SET sql_mode=ORACLE;
CREATE TABLE t1 (a BLOB); CREATE TABLE t1 (a BLOB);
SHOW CREATE TABLE t1; SHOW CREATE TABLE t1;
DROP TABLE t1; DROP TABLE t1;
--echo #
--echo # MDEV-20263 sql_mode=ORACLE: BLOB(65535) should not translate to LONGBLOB
--echo #
CREATE TABLE t1 (
c1 BLOB(100),
c2 BLOB(65535),
c3 BLOB(16777215),
c4 BLOB(16777216)
);
SHOW CREATE TABLE t1;
DROP TABLE t1;

4
sql/field.cc
View File

@ -8593,7 +8593,11 @@ void Field_blob::sql_type(String &res) const
} }
res.set_ascii(str,length); res.set_ascii(str,length);
if (charset() == &my_charset_bin) if (charset() == &my_charset_bin)
{
res.append(STRING_WITH_LEN("blob")); res.append(STRING_WITH_LEN("blob"));
if (packlength == 2 && (get_thd()->variables.sql_mode & MODE_ORACLE))
res.append(STRING_WITH_LEN("(65535)"));
}
else else
{ {
res.append(STRING_WITH_LEN("text")); res.append(STRING_WITH_LEN("text"));

7
sql/sql_yacc.yy
View File

@ -7086,7 +7086,12 @@ field_type_lob:
Lex->charset=&my_charset_bin; Lex->charset=&my_charset_bin;
$$.set(&type_handler_blob, $2); $$.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; Lex->charset=&my_charset_bin;
$$.set(&type_handler_long_blob); $$.set(&type_handler_long_blob);

7
sql/sql_yacc_ora.yy
View File

@ -6984,7 +6984,12 @@ field_type_lob:
Lex->charset=&my_charset_bin; Lex->charset=&my_charset_bin;
$$.set(&type_handler_blob, $2); $$.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; Lex->charset=&my_charset_bin;
$$.set(&type_handler_long_blob); $$.set(&type_handler_long_blob);