If get_charset() fails when trying to load the server's charset,

use the default charset instead of failing.

1 files changed, 4 insertions, 1 deletions

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;