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_show.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_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index b1cc696e9fe..1d2a81212a3 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -9744,8 +9744,9 @@ static bool show_create_trigger_impl(THD *thd, Trigger *trigger) sql_mode_string_representation(thd, trigger->sql_mode, &trg_sql_mode_str); /* Resolve trigger client character set. */ - - if (resolve_charset(trigger->client_cs_name.str, NULL, &trg_client_cs)) + myf utf8_flag= thd->get_utf8_flag(); + if (resolve_charset(trigger->client_cs_name.str, NULL, &trg_client_cs, + MYF(utf8_flag))) return TRUE; /* Send header. */ |