database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-05 13:16:09 +03:00
Code Activity

client.c:

Browse Source 
Bug #3990  	`--with-charset' ./configure's switch doesn'taffect mysql client library.


sql-common/client.c:
  Bug #3990  	`--with-charset' ./configure's switch doesn'taffect mysql client library.
This commit is contained in:
unknown
2004-06-07 17:28:31 +05:00
parent 8e5d446227
commit d23821d515
1 changed files with 25 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
sql-common/client.c
View File

@@ -1835,15 +1835,19 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user,
}
/* Set character set */
if (mysql->options.charset_name)
if (!mysql->options.charset_name &&
!(mysql->options.charset_name=
my_strdup(MYSQL_DEFAULT_CHARSET_NAME,MYF(MY_WME))))
goto error;
{
const char *save= charsets_dir;
if (mysql->options.charset_dir)
charsets_dir=mysql->options.charset_dir;
mysql->charset=get_charset_by_csname(mysql->options.charset_name,
MY_CS_PRIMARY,
MYF(MY_WME));
MY_CS_PRIMARY, MYF(MY_WME));
charsets_dir= save;
}
if (!mysql->charset)
{
@@ -1865,11 +1869,6 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user,
}
goto error;
}
}
else
{
mysql->charset= default_charset_info;
}
/* Save connection information */