database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Show charsets dir in error message, instead of just "path: default".

Browse Source 
include/my_sys.h:
  make get_charsets_dir a public function
libmysql/libmysql.c:
  show charsets dir instead of the string "default" in error message
mysys/charset.c:
  make get_charsets_dir a public function
This commit is contained in:
unknown
2000-10-09 16:10:41 -04:00
parent 6942c74c19
commit b465979edc
3 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libmysql/libmysql.c
View File

@ -1394,10 +1394,18 @@ mysql_real_connect(MYSQL *mysql,const char *host, const char *user,
if (!mysql->charset)
{
net->last_errno=CR_CANT_READ_CHARSET;
sprintf(net->last_error,ER(net->last_errno),
charset_name ? charset_name : "unknown",
mysql->options.charset_dir ? mysql->options.charset_dir :
"default");
if (mysql->options.charset_dir)
sprintf(net->last_error,ER(net->last_errno),
charset_name ? charset_name : "unknown",
mysql->options.charset_dir);
else
{
char cs_dir_name[FN_REFLEN];
get_charsets_dir(cs_dir_name);
sprintf(net->last_error,ER(net->last_errno),
charset_name ? charset_name : "unknown",
cs_dir_name);
}
goto error;
}