Commit 65a61dc4 authored by tim@cane.mysql.fi's avatar tim@cane.mysql.fi
Browse files

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

use the default charset instead of failing.
parent bf0557cc

libmysql/libmysql.c

+4 −1
Original line number Diff line number Diff line
@@ -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;