1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-25259 JSON_TABLE: Illegal mix of collations upon executing query with combination of charsets via view.

Browse Source 
The ::print method didn't print the explicitly specified charset.
This commit is contained in:
Alexey Botchkov 2021-04-12 23:17:32 +04:00
parent 67b31a6e4c
commit a2ce788f02
3 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mysql-test/suite/json/r/json_table.result
View File

@ -793,5 +793,15 @@ a b c o
DROP VIEW v2;
DROP TABLE t1, t2;
#
# MDEV-25259 JSON_TABLE: Illegal mix of collations upon executing query with combination of charsets via view.
#
CREATE VIEW v AS
SELECT * FROM JSON_TABLE(CONVERT('[]' USING dec8),
'$' COLUMNS(b VARCHAR(8) CHARSET utf8 PATH '$')) AS jt2
WHERE (CONVERT('[]' USING cp1256) = b);
SELECT * FROM v;
b
DROP VIEW v;
#
# End of 10.6 tests
#

13
mysql-test/suite/json/t/json_table.test
View File

@ -685,6 +685,19 @@ FROM
DROP VIEW v2;
DROP TABLE t1, t2;
--echo #
--echo # MDEV-25259 JSON_TABLE: Illegal mix of collations upon executing query with combination of charsets via view.
--echo #
CREATE VIEW v AS
SELECT * FROM JSON_TABLE(CONVERT('[]' USING dec8),
'$' COLUMNS(b VARCHAR(8) CHARSET utf8 PATH '$')) AS jt2
WHERE (CONVERT('[]' USING cp1256) = b);
SELECT * FROM v;
DROP VIEW v;
--echo #
--echo # End of 10.6 tests
--echo #

2
sql/json_table.cc
View File

@ -1098,6 +1098,8 @@ int Json_table_column::print(THD *thd, Field **f, String *str)
(*f)->sql_type(column_type);
if (str->append(column_type) ||
(m_explicit_cs &&
(str->append(" CHARSET ") || str->append(m_explicit_cs->csname))) ||
str->append(m_column_type == PATH ? " PATH " : " EXISTS PATH ") ||
print_path(str, &m_path))
return 1;