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

An additional patch for MDEV-27690 Crash on CHARACTER SET csname COLLATE DEFAULT in column definition

Browse Source 
Applying the fix to sql_yacc_ora.yy. Adding a test for sql_mode=ORACLE.
This commit is contained in:
Alexander Barkov
2022-04-14 12:22:28 +04:00
parent 9d734cdd61
commit 83516a33a8
3 changed files with 63 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
mysql-test/suite/compat/oracle/r/misc.result
View File

@ -1,5 +1,25 @@
SET sql_mode=ORACLE; SET sql_mode=ORACLE;
# #
# Start of 10.2 tests
#
#
# MDEV-27690 Crash on `CHARACTER SET csname COLLATE DEFAULT` in column definition
#
CREATE TABLE t1 (a CHAR(10) CHARACTER SET latin1 COLLATE DEFAULT);
DROP TABLE t1;
SELECT CAST('a' AS CHAR(10) CHARACTER SET latin1 COLLATE DEFAULT);
CAST('a' AS CHAR(10) CHARACTER SET latin1 COLLATE DEFAULT)
a
SELECT COLUMN_GET(COLUMN_CREATE(0, 'string'),0 AS CHAR CHARACTER SET latin1 COLLATE DEFAULT) AS c1;
c1
string
#
# End of 10.2 tests
#
#
# Start of 10.3 tests
#
#
# MDEV-12086 sql_mode=ORACLE: allow SELECT UNIQUE as a synonym for SELECT DISTINCT # MDEV-12086 sql_mode=ORACLE: allow SELECT UNIQUE as a synonym for SELECT DISTINCT
# #
CREATE TABLE t1 (a INT); CREATE TABLE t1 (a INT);
@ -10,3 +30,6 @@ a
20 20
30 30
DROP TABLE t1; DROP TABLE t1;
#
# End of 10.3 tests
#

28
mysql-test/suite/compat/oracle/t/misc.test
View File

@ -1,5 +1,28 @@
SET sql_mode=ORACLE; SET sql_mode=ORACLE;
--echo #
--echo # Start of 10.2 tests
--echo #
--echo #
--echo # MDEV-27690 Crash on `CHARACTER SET csname COLLATE DEFAULT` in column definition
--echo #
CREATE TABLE t1 (a CHAR(10) CHARACTER SET latin1 COLLATE DEFAULT);
DROP TABLE t1;
SELECT CAST('a' AS CHAR(10) CHARACTER SET latin1 COLLATE DEFAULT);
SELECT COLUMN_GET(COLUMN_CREATE(0, 'string'),0 AS CHAR CHARACTER SET latin1 COLLATE DEFAULT) AS c1;
--echo #
--echo # End of 10.2 tests
--echo #
--echo #
--echo # Start of 10.3 tests
--echo #
--echo # --echo #
--echo # MDEV-12086 sql_mode=ORACLE: allow SELECT UNIQUE as a synonym for SELECT DISTINCT --echo # MDEV-12086 sql_mode=ORACLE: allow SELECT UNIQUE as a synonym for SELECT DISTINCT
--echo # --echo #
@ -8,3 +31,8 @@ CREATE TABLE t1 (a INT);
INSERT INTO t1 VALUES (10),(20),(20),(30),(30),(30); INSERT INTO t1 VALUES (10),(20),(20),(30),(30),(30);
SELECT UNIQUE a FROM t1; SELECT UNIQUE a FROM t1;
DROP TABLE t1; DROP TABLE t1;
--echo #
--echo # End of 10.3 tests
--echo #

20
sql/sql_yacc_ora.yy
View File

@ -1438,6 +1438,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, size_t *yystacksize);
%type <charset> %type <charset>
opt_collate opt_collate
collate
charset_name charset_name
charset_or_alias charset_or_alias
charset_name_or_default charset_name_or_default
@ -7466,10 +7467,7 @@ charset_or_alias:
} }
; ;
collate: COLLATE_SYM collation_name_or_default collate: COLLATE_SYM collation_name_or_default { $$= $2; }
{
Lex->charset= $2;
}
; ;
opt_binary: opt_binary:
@ -7484,11 +7482,17 @@ binary:
| BINARY charset_or_alias { bincmp_collation($2, true); } | BINARY charset_or_alias { bincmp_collation($2, true); }
| charset_or_alias collate | charset_or_alias collate
{ {
if (!my_charset_same(Lex->charset, $1)) if (!$2)
my_yyabort_error((ER_COLLATION_CHARSET_MISMATCH, MYF(0), Lex->charset= $1; // CHARACTER SET cs COLLATE DEFAULT
Lex->charset->name, $1->csname)); 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: opt_bin_mod: