summaryrefslogtreecommitdiff
path: root/sql/set_var.cc
diff options
context:
space:
mode:
authorunknown <bar@bar.mysql.r18.ru>2003-05-30 23:09:35 +0500
committerunknown <bar@bar.mysql.r18.ru>2003-05-30 23:09:35 +0500
commit487a64963b2382fdf816770402fb05d0c681aa23 (patch)
treec740544d9252d2f43d5e5b1b8411dad92bceaa88 /sql/set_var.cc
parentd1e7a597aece2bb4aa68069dbfdb3ed85f5cfb31 (diff)
downloadmariadb-git-487a64963b2382fdf816770402fb05d0c681aa23.tar.gz
mysqlshow and mysqldump now send their vharacter set to server
character_set_results is now the same with character_set_client by default
Diffstat (limited to 'sql/set_var.cc')
-rw-r--r--sql/set_var.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc
index eb44dd1dbcb..60b0d24430d 100644
--- a/sql/set_var.cc
+++ b/sql/set_var.cc
@@ -1355,7 +1355,7 @@ CHARSET_INFO ** sys_var_character_set_results::ci_ptr(THD *thd, enum_var_type ty
void sys_var_character_set_results::set_default(THD *thd, enum_var_type type)
{
if (type == OPT_GLOBAL)
- global_system_variables.character_set_results= NULL;
+ global_system_variables.character_set_results= default_charset_info;
else
thd->variables.character_set_results= global_system_variables.character_set_results;
}