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
This commit is contained in:
tim@threads.polyesthetic.msg
2000-10-09 16:10:41 -04:00
parent 4bdf3ca993
commit 395a1809a6
3 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/my_sys.h
View File

@ -178,6 +178,7 @@ extern CHARSET_INFO *get_charset_by_name(const char *cs_name, myf flags);
extern my_bool set_default_charset_by_name(const char *cs_name, myf flags); extern my_bool set_default_charset_by_name(const char *cs_name, myf flags);
extern void free_charsets(void); extern void free_charsets(void);
extern char *list_charsets(myf want_flags); /* my_free() this string... */ extern char *list_charsets(myf want_flags); /* my_free() this string... */
extern char *get_charsets_dir(char *buf);
/* statistics */ /* statistics */

16
libmysql/libmysql.c
View File

@ -1394,10 +1394,18 @@ mysql_real_connect(MYSQL *mysql,const char *host, const char *user,
if (!mysql->charset) if (!mysql->charset)
{ {
net->last_errno=CR_CANT_READ_CHARSET; net->last_errno=CR_CANT_READ_CHARSET;
sprintf(net->last_error,ER(net->last_errno), if (mysql->options.charset_dir)
charset_name ? charset_name : "unknown", sprintf(net->last_error,ER(net->last_errno),
mysql->options.charset_dir ? mysql->options.charset_dir : charset_name ? charset_name : "unknown",
"default"); 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; goto error;
} }

2
mysys/charset.c
View File

@ -94,7 +94,7 @@ static my_bool get_word(struct simpleconfig_buf_st *fb, char *buf)
} }
static char *get_charsets_dir(char *buf) char *get_charsets_dir(char *buf)
{ {
const char *sharedir = SHAREDIR; const char *sharedir = SHAREDIR;
DBUG_ENTER("get_charsets_dir"); DBUG_ENTER("get_charsets_dir");