diff options
| author | unknown <tim@threads.polyesthetic.msg> | 2000-10-09 16:10:41 -0400 |
|---|---|---|
| committer | unknown <tim@threads.polyesthetic.msg> | 2000-10-09 16:10:41 -0400 |
| commit | b797363ea1e7fd9b1ff6c257860b496cad1f8c74 (patch) | |
| tree | 7ee386f056f17ab02fb741a34d9313830d4a71c4 /libmysql/libmysql.c | |
| parent | 07e59bd9b1269cc3415966653b4bf77b4d59eaca (diff) | |
| download | mariadb-git-b797363ea1e7fd9b1ff6c257860b496cad1f8c74.tar.gz | |
Show charsets dir in error message, instead of just "path: default".
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
Diffstat (limited to 'libmysql/libmysql.c')
| -rw-r--r-- | libmysql/libmysql.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index 1f78dc2153b..fecdd073a47 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -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; } |