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

MDEV-27696 Json table columns accept redundant COLLATE syntax

Browse Source
This commit is contained in:
Alexander Barkov
2022-01-31 21:18:43 +04:00
parent 2d4a0f6079
commit 2a0962f39b
5 changed files with 69 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/json_table.cc
View File

@ -851,9 +851,11 @@ TABLE *create_table_for_function(THD *thd, TABLE_LIST *sql_table)
}
int Json_table_column::set(THD *thd, enum_type ctype, const LEX_CSTRING &path)
int Json_table_column::set(THD *thd, enum_type ctype, const LEX_CSTRING &path,
CHARSET_INFO *cs)
{
set(ctype);
m_explicit_cs= cs;
if (json_path_setup(&m_path, thd->variables.collation_connection,
(const uchar *) path.str, (const uchar *)(path.str + path.length)))
{