From 0c1ce1c33f07fc185d516b8ba4b525d2b432f06e Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 5 Nov 2001 19:15:45 -0500 Subject: Do not print a warning message when the server's character set is not found by the client. This is especially important for PHP, which only includes the latin1 character set in the bundled libmysql. libmysql/libmysql.c: Do not print a warning message when the server's character set is not found by the client. (In this case, the client has always fallen back on the default character set - this change just turns off the warning.) mysys/charset.c: Pass flags in from the outside, instead of hard coding MY_WME, in add_charset(). --- libmysql/libmysql.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libmysql') diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index 8f228f51ed7..7f648eb90df 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -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 */ } -- cgit v1.2.1