diff options
| author | Alexander Barkov <bar@mysql.com> | 2009-10-21 17:59:47 +0500 |
|---|---|---|
| committer | Alexander Barkov <bar@mysql.com> | 2009-10-21 17:59:47 +0500 |
| commit | 99eae48a97fdf4399ca55b7e28ff97a9332f0f23 (patch) | |
| tree | 9daa322eb14aa0cd7af60162e5b2b6c77446def6 /client/mysqladmin.cc | |
| parent | 1b26332898746bd3738fec850eb1206114c19448 (diff) | |
| download | mariadb-git-99eae48a97fdf4399ca55b7e28ff97a9332f0f23.tar.gz | |
WL#1349 Use operating system localization to send it as a default client character set
Diffstat (limited to 'client/mysqladmin.cc')
| -rw-r--r-- | client/mysqladmin.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/client/mysqladmin.cc b/client/mysqladmin.cc index 2b93c149523..a3eee14e0d1 100644 --- a/client/mysqladmin.cc +++ b/client/mysqladmin.cc @@ -30,7 +30,7 @@ #define MAX_TRUNC_LENGTH 3 char *host= NULL, *user= 0, *opt_password= 0, - *default_charset= NULL; + *default_charset= (char*) MYSQL_AUTODETECT_CHARSET_NAME; char truncated_var_names[MAX_MYSQL_VAR][MAX_TRUNC_LENGTH]; char ex_var_names[MAX_MYSQL_VAR][FN_REFLEN]; ulonglong last_values[MAX_MYSQL_VAR]; @@ -348,8 +348,7 @@ 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 (default_charset) - mysql_options(&mysql, MYSQL_SET_CHARSET_NAME, default_charset); + mysql_options(&mysql, MYSQL_SET_CHARSET_NAME, default_charset); error_flags= (myf)(opt_nobeep ? 0 : ME_BELL); if (sql_connect(&mysql, option_wait)) |