Commit 4ac98ec5 authored by unknown's avatar unknown

set_var.cc:

  We don't need this code any more. It was used to initialize CONVERT structure in 4.0.


sql/set_var.cc:
  We don't need this code any more. It was used to initialize CONVERT structure in 4.0.
parent bb12690a
...@@ -1215,11 +1215,7 @@ bool sys_var_collation_client::update(THD *thd, set_var *var) ...@@ -1215,11 +1215,7 @@ bool sys_var_collation_client::update(THD *thd, set_var *var)
if (var->type == OPT_GLOBAL) if (var->type == OPT_GLOBAL)
global_system_variables.collation_client= var->save_result.charset; global_system_variables.collation_client= var->save_result.charset;
else else
{
thd->variables.collation_client= var->save_result.charset; thd->variables.collation_client= var->save_result.charset;
thd->protocol_simple.init(thd);
thd->protocol_prep.init(thd);
}
return 0; return 0;
} }
...@@ -1236,9 +1232,7 @@ void sys_var_collation_client::set_default(THD *thd, enum_var_type type) ...@@ -1236,9 +1232,7 @@ void sys_var_collation_client::set_default(THD *thd, enum_var_type type)
if (type == OPT_GLOBAL) if (type == OPT_GLOBAL)
global_system_variables.collation_client= default_charset_info; global_system_variables.collation_client= default_charset_info;
else else
{
thd->variables.collation_client= global_system_variables.collation_client; thd->variables.collation_client= global_system_variables.collation_client;
}
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment