diff options
| author | tim@black.box <> | 2001-11-06 07:50:58 -0500 |
|---|---|---|
| committer | tim@black.box <> | 2001-11-06 07:50:58 -0500 |
| commit | 9d304d8c310a0a5df1bd81935e838cfab5c6e4d2 (patch) | |
| tree | f815454ce99c3a4f08fdd9e9b3400f2e0446749e /libmysql | |
| parent | fd5d367f13b2d45a449a664a959a6ec3f3c793ad (diff) | |
| parent | 34e2c4b2abebf747cd2d0e58d16c377953fd053b (diff) | |
| download | mariadb-git-9d304d8c310a0a5df1bd81935e838cfab5c6e4d2.tar.gz | |
Merge
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 */ } |