diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-06-19 08:56:10 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-06-19 08:56:10 +0300 |
| commit | 192aa295b4bc877d0fed24154c57304c3f789179 (patch) | |
| tree | 893239effa9f3c9a7d00b324de9b4e41c63bdb4d /client/mysqlimport.c | |
| parent | 03f3ba2dcb07a672f9c1d87489b9ec88af62a96f (diff) | |
| parent | 8acbf9c1f961aa1008ef509e059e1a09943f5ed3 (diff) | |
| download | mariadb-git-192aa295b4bc877d0fed24154c57304c3f789179.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'client/mysqlimport.c')
| -rw-r--r-- | client/mysqlimport.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/client/mysqlimport.c b/client/mysqlimport.c index dbb2e8f7dba..32ad74dd5d1 100644 --- a/client/mysqlimport.c +++ b/client/mysqlimport.c @@ -30,6 +30,8 @@ #define IMPORT_VERSION "3.7" #include "client_priv.h" +#include <my_sys.h> + #include "mysql_version.h" #include <welcome_copyright_notice.h> /* ORACLE_WELCOME_COPYRIGHT_NOTICE */ @@ -472,8 +474,9 @@ static MYSQL *db_connect(char *host, char *database, if (opt_default_auth && *opt_default_auth) mysql_options(mysql, MYSQL_DEFAULT_AUTH, opt_default_auth); - - mysql_options(mysql, MYSQL_SET_CHARSET_NAME, default_charset); + if (!strcmp(default_charset,MYSQL_AUTODETECT_CHARSET_NAME)) + default_charset= (char *)my_default_csname(); + mysql_options(mysql, MYSQL_SET_CHARSET_NAME, my_default_csname()); mysql_options(mysql, MYSQL_OPT_CONNECT_ATTR_RESET, 0); mysql_options4(mysql, MYSQL_OPT_CONNECT_ATTR_ADD, "program_name", "mysqlimport"); |