diff options
Diffstat (limited to 'sql/json_table.cc')
| -rw-r--r-- | sql/json_table.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sql/json_table.cc b/sql/json_table.cc index 05ee83bd3d8..c4f03201654 100644 --- a/sql/json_table.cc +++ b/sql/json_table.cc @@ -935,7 +935,11 @@ int Json_table_column::set(THD *thd, enum_type ctype, const LEX_CSTRING &path, return set(thd, ctype, path, nullptr); CHARSET_INFO *tmp; - if (!(tmp= cl.resolved_to_character_set(&my_charset_utf8mb4_general_ci))) + Character_set_collations_used used(thd); + if (!(tmp= cl.resolved_to_character_set( + &used, + thd->variables.character_set_collations, + &my_charset_utf8mb4_general_ci))) return 1; return set(thd, ctype, path, tmp); } |