database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge 10.4 into 10.5

Browse Source
This commit is contained in:
Marko Mäkelä
2021-03-27 17:37:42 +02:00
parent 2e67b9f665 7ae37ff74f
commit 80459bcbd4
61 changed files with 905 additions and 632 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client/mysql.cc
View File

@@ -4716,7 +4716,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;