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 /client/mysqlcheck.c | |
| 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 'client/mysqlcheck.c')
| -rw-r--r-- | client/mysqlcheck.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/client/mysqlcheck.c b/client/mysqlcheck.c index fb3103a318d..5ff4dd35bc1 100644 --- a/client/mysqlcheck.c +++ b/client/mysqlcheck.c @@ -444,7 +444,8 @@ static int get_options(int *argc, char ***argv) if (!strcmp(default_charset, MYSQL_AUTODETECT_CHARSET_NAME)) default_charset= (char *)my_default_csname(); - if (!get_charset_by_csname(default_charset, MY_CS_PRIMARY, MYF(MY_WME))) + if (!get_charset_by_csname(default_charset, MY_CS_PRIMARY, + MYF(MY_UTF8_IS_UTF8MB3 | MY_WME))) { printf("Unsupported character set: %s\n", default_charset); DBUG_RETURN(1); |