diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-10-28 10:55:44 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-10-28 10:55:44 +0300 |
| commit | ac7ba1bcaac891b046ad028e035487da44448eeb (patch) | |
| tree | 76a0977cebe3775f61ae3281cc608601eb883243 /client/mysqlshow.c | |
| parent | f89b2496ffdf96d1d4b32099d38ce0565ac1d93a (diff) | |
| parent | 273a0a4f97ea07620675cba1f61e84dd83c21a2f (diff) | |
| download | mariadb-git-ac7ba1bcaac891b046ad028e035487da44448eeb.tar.gz | |
Merge from mysql-next-mr.
Diffstat (limited to 'client/mysqlshow.c')
| -rw-r--r-- | client/mysqlshow.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/client/mysqlshow.c b/client/mysqlshow.c index 15f791ca8fb..206b86d07cf 100644 --- a/client/mysqlshow.c +++ b/client/mysqlshow.c @@ -32,7 +32,7 @@ static my_bool tty_password= 0, opt_table_type= 0; static my_bool debug_info_flag= 0, debug_check_flag= 0; static uint my_end_arg= 0; static uint opt_verbose=0; -static char *default_charset= (char*) MYSQL_DEFAULT_CHARSET_NAME; +static char *default_charset= (char*) MYSQL_AUTODETECT_CHARSET_NAME; #ifdef HAVE_SMEM static char *shared_memory_base_name=0; |