diff options
| author | unknown <tim@black.box> | 2001-11-05 19:15:45 -0500 |
|---|---|---|
| committer | unknown <tim@black.box> | 2001-11-05 19:15:45 -0500 |
| commit | 0c1ce1c33f07fc185d516b8ba4b525d2b432f06e (patch) | |
| tree | 38ff4ffa597011141f4d5ffe48755ed8e4803a28 /libmysql | |
| parent | b109a7733184558d57f0869944781fb2999ddf89 (diff) | |
| download | mariadb-git-0c1ce1c33f07fc185d516b8ba4b525d2b432f06e.tar.gz | |
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().
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/libmysql.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 */ } |