diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2019-06-17 09:56:00 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2019-06-17 18:04:47 +0100 |
| commit | 5804bb4ef0acd7ac42e628c2d8c404957dc86cf9 (patch) | |
| tree | d8180213953c76959d0a19aeb9c3e688722b23e2 /client/mysqlshow.c | |
| parent | 81f60e8adeb241ed845427e0792349f3a05af99b (diff) | |
| download | mariadb-git-5804bb4ef0acd7ac42e628c2d8c404957dc86cf9.tar.gz | |
MDEV-19750 mysql command wrong encoding
Restore the detection of default charset in command line utilities.
It worked up to 10.1, but was broken by Connector/C.
Moved code for detection of default charset from sql-common/client.c
to mysys, and make command line utilities to use this code if charset
was not specified on the command line.
Diffstat (limited to 'client/mysqlshow.c')
| -rw-r--r-- | client/mysqlshow.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/client/mysqlshow.c b/client/mysqlshow.c index 3fb2d371f2f..47dc7212ca2 100644 --- a/client/mysqlshow.c +++ b/client/mysqlshow.c @@ -135,6 +135,8 @@ int main(int argc, char **argv) if (shared_memory_base_name) mysql_options(&mysql,MYSQL_SHARED_MEMORY_BASE_NAME,shared_memory_base_name); #endif + if (!strcmp(default_charset,MYSQL_AUTODETECT_CHARSET_NAME)) + default_charset= (char *)my_default_csname(); mysql_options(&mysql, MYSQL_SET_CHARSET_NAME, default_charset); if (opt_plugin_dir && *opt_plugin_dir) |