mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-14 19:07:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge

Browse source 
Docs/manual.texi:
  SCCS merged
libmysql/libmysql.c:
  SCCS merged
This commit is contained in:
unknown 2001-11-06 07:50:58 -05:00
commit ded5902f71
3 changed files with 156 additions and 153 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libmysql/libmysql.c
View file

@ -1712,7 +1712,7 @@ 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 */
if (!(mysql->charset =
get_charset((uint8) mysql->server_language, MYF(MY_WME))))
get_charset((uint8) mysql->server_language, MYF(0))))
mysql->charset = default_charset_info; /* shouldn't be fatal */
}