diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2021-03-23 21:53:27 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2021-03-23 21:53:44 +0100 |
| commit | c4807c107a46597f52565243a722992467383a73 (patch) | |
| tree | 86a95326ecaaf0645564406901e2ac5d4d09898c | |
| parent | 3dae564703a63881901074cafbe5a55f1c4631ea (diff) | |
| download | mariadb-git-c4807c107a46597f52565243a722992467383a73.tar.gz | |
MDEV-24879 Client crash on undefined charsetsdir
| -rw-r--r-- | client/mysql.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index f61fab416d5..2eb44d46512 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -4720,7 +4720,11 @@ sql_real_connect(char *host,char *database,char *user,char *password, return -1; // Retryable } - charset_info= get_charset_by_name(mysql.charset->name, MYF(0)); + if (!(charset_info= get_charset_by_name(mysql.charset->name, MYF(0)))) + { + put_info("Unknown default character set", INFO_ERROR); + return 1; + } connected=1; |