diff options
| author | unknown <tim@black.box> | 2001-11-06 07:50:58 -0500 |
|---|---|---|
| committer | unknown <tim@black.box> | 2001-11-06 07:50:58 -0500 |
| commit | ded5902f713a22d2573af7a0db793c1cfcfaa7f8 (patch) | |
| tree | f815454ce99c3a4f08fdd9e9b3400f2e0446749e /libmysql | |
| parent | 93665901485541f49f6a14755c56cc8cef6fd41f (diff) | |
| parent | 0c1ce1c33f07fc185d516b8ba4b525d2b432f06e (diff) | |
| download | mariadb-git-ded5902f713a22d2573af7a0db793c1cfcfaa7f8.tar.gz | |
Merge
Docs/manual.texi:
SCCS merged
libmysql/libmysql.c:
SCCS merged
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 3a76998b655..02921480abd 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 */ } |