diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-11-07 00:14:43 +0200 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-11-07 00:14:43 +0200 |
| commit | 228408a8c54e34922832082c0e36c1e87f224873 (patch) | |
| tree | 159482f3548d082a75cf857a65f76395451f47da /libmysql | |
| parent | 8547d05ccc9c00450ae8b226cb38f53f90162958 (diff) | |
| parent | e49cf66e07b2b3abdceb63beed09ea9045c2dbb8 (diff) | |
| download | mariadb-git-228408a8c54e34922832082c0e36c1e87f224873.tar.gz | |
Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
Docs/manual.texi:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/sql_yacc.yy:
Auto 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 */ } |