diff options
Diffstat (limited to 'client/mysql.cc')
| -rw-r--r-- | client/mysql.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index 433fbd281b9..faf2f7ee400 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -3176,7 +3176,8 @@ com_charset(String *buffer __attribute__((unused)), char *line) return put_info("Usage: \\C charset_name | charset charset_name", INFO_ERROR, 0); } - new_cs= get_charset_by_csname(param, MY_CS_PRIMARY, MYF(MY_WME)); + new_cs= get_charset_by_csname(param, MY_CS_PRIMARY, + MYF(MY_UTF8_IS_UTF8MB3 | MY_WME)); if (new_cs) { charset_info= new_cs; @@ -4716,12 +4717,11 @@ sql_real_connect(char *host,char *database,char *user,char *password, return -1; // Retryable } - if (!(charset_info= get_charset_by_name(mysql.charset->name, MYF(0)))) + if (!(charset_info= get_charset_by_name(mysql.charset->name, MYF(MY_UTF8_IS_UTF8MB3)))) { put_info("Unknown default character set", INFO_ERROR); return 1; } - connected=1; #ifndef EMBEDDED_LIBRARY |