diff options
| author | Rucha Deodhar <rucha.deodhar@mariadb.com> | 2021-02-15 01:39:37 +0530 |
|---|---|---|
| committer | Rucha Deodhar <rucha.deodhar@mariadb.com> | 2021-04-20 12:50:32 +0530 |
| commit | e7762b3a725d0608f63a4c9bfb4e1db87cf20fe7 (patch) | |
| tree | 3e3aed3cd181ea2ed30903d47a99e7cf8d3a8dd0 /sql/sql_lex.cc | |
| parent | bfedf1eb4b63235e7dd88f36305758f52f28f27d (diff) | |
| download | mariadb-git-bb-10.6-MDEV-8334.tar.gz | |
MDEV-8334: Rename utf8 to utf8mb3bb-10.6-MDEV-8334
This patch changes the main name of 3 byte character set from utf8 to
utf8mb3. New old_mode UTF8_IS_UTF8MB3 is added and set TRUE by default,
so that utf8 would mean utf8mb3. If not set, utf8 would mean utf8mb4.
Diffstat (limited to 'sql/sql_lex.cc')
| -rw-r--r-- | sql/sql_lex.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index 1dbeff69cb5..6b9a43865d4 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -2789,8 +2789,10 @@ int Lex_input_stream::scan_ident_middle(THD *thd, Lex_ident_cli_st *str, m_cpp_text_end= m_cpp_text_start + length; body_utf8_append(m_cpp_text_start, m_cpp_tok_start + length); ErrConvString csname(str->str + 1, str->length - 1, &my_charset_bin); + myf utf8_flag= thd->get_utf8_flag(); CHARSET_INFO *cs= get_charset_by_csname(csname.ptr(), - MY_CS_PRIMARY, MYF(0)); + MY_CS_PRIMARY, + MYF(utf8_flag)); if (cs) { *introducer= cs; |