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 /client/mysql.cc | |
| 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 'client/mysql.cc')
| -rw-r--r-- | client/mysql.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index 6612b273d17..f80996f3d0d 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -3693,7 +3693,10 @@ static char *fieldflags2str(uint f) { ff2s_check_flag(NUM); ff2s_check_flag(PART_KEY); ff2s_check_flag(GROUP); - ff2s_check_flag(BINCMP); + /* + CONTEXT_COLLATION_FLAG (former BINCMP_FLAG) is used at parse + time only and should never show up on the client side. Don't test it. + */ ff2s_check_flag(ON_UPDATE_NOW); #undef ff2s_check_flag if (f) |