From c1aa6bd97d83328edc5b7a766f9cbf30e12cea1b Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 16 Jan 2001 21:39:16 +0200 Subject: If get_charset() fails when trying to load the server's charset, use the default charset instead of failing. --- libmysql/libmysql.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'libmysql/libmysql.c') diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index 164ef2723e5..5f4604701ae 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -1404,7 +1404,10 @@ mysql_real_connect(MYSQL *mysql,const char *host, const char *user, { charset_name=charset_name_buff; sprintf(charset_name,"%d",mysql->server_language); /* In case of errors */ - mysql->charset=get_charset((uint8) mysql->server_language, MYF(MY_WME)); + if (!(mysql->charset = + get_charset((uint8) mysql->server_language, MYF(MY_WME)))) + mysql->charset = default_charset_info; /* shouldn't be fatal */ + } else mysql->charset=default_charset_info; -- cgit v1.2.1