diff options
| author | Alexander Barkov <bar@mariadb.com> | 2022-02-09 21:21:39 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2022-03-22 17:12:15 +0400 |
| commit | 0c4c064f98120e179ddfa49a1010d465a07bdc0a (patch) | |
| tree | e8b4414484306ff6eb817269d34a07912e1f49df /sql/json_table.h | |
| parent | d25b10fede8926f63203dfd2040ec60549d10936 (diff) | |
| download | mariadb-git-0c4c064f98120e179ddfa49a1010d465a07bdc0a.tar.gz | |
MDEV-27743 Remove Lex::charset
This patch also fixes:
MDEV-27690 Crash on `CHARACTER SET csname COLLATE DEFAULT` in column definition
MDEV-27853 Wrong data type on column `COLLATE DEFAULT` and table `COLLATE some_non_default_collation`
MDEV-28067 Multiple conflicting column COLLATE clauses are not rejected
MDEV-28118 Wrong collation of `CAST(.. AS CHAR COLLATE DEFAULT)`
MDEV-28119 Wrong column collation on MODIFY + CONVERT
Diffstat (limited to 'sql/json_table.h')
| -rw-r--r-- | sql/json_table.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/json_table.h b/sql/json_table.h index 52cdae13e9b..2cadb07961e 100644 --- a/sql/json_table.h +++ b/sql/json_table.h @@ -160,6 +160,8 @@ public: m_column_type= ctype; } int set(THD *thd, enum_type ctype, const LEX_CSTRING &path, CHARSET_INFO *cs); + int set(THD *thd, enum_type ctype, const LEX_CSTRING &path, + const Lex_charset_collation_st &cl); Json_table_column(Create_field *f, Json_table_nested_path *nest) : m_field(f), m_nest(nest), m_explicit_cs(NULL) { |