diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-03-27 17:12:28 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-03-27 17:12:28 +0200 |
| commit | 7ae37ff74fc18c391bd0d3fd1fbf6afafe966435 (patch) | |
| tree | 792d8852dd9aaa06b5ddfb374f02774b18ed150c /client | |
| parent | d1ff2c583f452d8e1899f800609c329c998f0a33 (diff) | |
| parent | 3157fa182accab86a4dea45edbcbca4eb5157723 (diff) | |
| download | mariadb-git-7ae37ff74fc18c391bd0d3fd1fbf6afafe966435.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'client')
| -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 3cae7241969..b7a2d6c5e72 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -4704,7 +4704,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; |