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 /libmysqld | |
| 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 'libmysqld')
| -rw-r--r-- | libmysqld/CMakeLists.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt index cacaaae9a6d..62325b12349 100644 --- a/libmysqld/CMakeLists.txt +++ b/libmysqld/CMakeLists.txt @@ -118,6 +118,7 @@ SET(SQL_EMBEDDED_SOURCES emb_qcache.cc libmysqld.c lib_sql.cc ../sql/sql_analyze_stmt.cc ../sql/sql_analyze_stmt.h ../sql/compat56.cc ../sql/sql_schema.cc + ../sql/lex_charset.cc ../sql/sql_type.cc ../sql/sql_type.h ../sql/sql_mode.cc ../sql/sql_type_string.cc |