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.
This commit is contained in:
parent
bb12690ad7
commit
4ac98ec521
@ -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)
|
|||||||
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;
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user