diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-06-19 10:49:00 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-06-19 10:49:00 +0300 |
commit | 02979daab48d871e8c43a227b8f4462128439f17 (patch) | |
tree | 21dba14f0073df2328677ed0a90a3596f043bdeb /client/mysqlcheck.c | |
parent | efbfcc8b73d9fd8bafd86ab387e0c1edd39e208b (diff) | |
parent | 192aa295b4bc877d0fed24154c57304c3f789179 (diff) | |
download | mariadb-git-02979daab48d871e8c43a227b8f4462128439f17.tar.gz |
Merge 10.3 into 10.4
Diffstat (limited to 'client/mysqlcheck.c')
-rw-r--r-- | client/mysqlcheck.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/client/mysqlcheck.c b/client/mysqlcheck.c index 7eec7ee9f4f..7e9546e0dc2 100644 --- a/client/mysqlcheck.c +++ b/client/mysqlcheck.c @@ -434,8 +434,10 @@ static int get_options(int *argc, char ***argv) else default_charset= (char*) MYSQL_AUTODETECT_CHARSET_NAME; } - if (strcmp(default_charset, MYSQL_AUTODETECT_CHARSET_NAME) && - !get_charset_by_csname(default_charset, MY_CS_PRIMARY, MYF(MY_WME))) + 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))) { printf("Unsupported character set: %s\n", default_charset); DBUG_RETURN(1); |