Commit fb4f5e7d authored by bar@bar.mysql.r18.ru's avatar bar@bar.mysql.r18.ru

Bug fix:

  SET character_set_connection=newcharset;
  SELECT hex('text');

The above sequence failed in some cases.
parent 1932b40c
...@@ -70,3 +70,11 @@ SHOW TABLES IN ...@@ -70,3 +70,11 @@ SHOW TABLES IN
Tables_in_ Tables_in_
SET CHARACTER SET koi8r; SET CHARACTER SET koi8r;
DROP DATABASE ; DROP DATABASE ;
SET NAMES koi8r;
SELECT hex('');
hex('')
D4C5D3D4
SET character_set_connection=cp1251;
SELECT hex('');
hex('')
F2E5F1F2
...@@ -45,3 +45,8 @@ SHOW TABLES; ...@@ -45,3 +45,8 @@ SHOW TABLES;
SHOW TABLES IN ; SHOW TABLES IN ;
SET CHARACTER SET koi8r; SET CHARACTER SET koi8r;
DROP DATABASE ; DROP DATABASE ;
SET NAMES koi8r;
SELECT hex('');
SET character_set_connection=cp1251;
SELECT hex('');
...@@ -1343,6 +1343,7 @@ bool sys_var_character_set::check(THD *thd, set_var *var) ...@@ -1343,6 +1343,7 @@ bool sys_var_character_set::check(THD *thd, set_var *var)
bool sys_var_character_set::update(THD *thd, set_var *var) bool sys_var_character_set::update(THD *thd, set_var *var)
{ {
ci_ptr(thd,var->type)[0]= var->save_result.charset; ci_ptr(thd,var->type)[0]= var->save_result.charset;
thd->update_charset();
return 0; return 0;
} }
......
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