mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Bug fix:
SET character_set_connection=newcharset; SELECT hex('text'); The above sequence failed in some cases.
This commit is contained in:
@ -70,3 +70,11 @@ SHOW TABLES IN
|
|||||||
Tables_in_<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
Tables_in_<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||||
SET CHARACTER SET koi8r;
|
SET CHARACTER SET koi8r;
|
||||||
DROP DATABASE <20><><EFBFBD><EFBFBD>;
|
DROP DATABASE <20><><EFBFBD><EFBFBD>;
|
||||||
|
SET NAMES koi8r;
|
||||||
|
SELECT hex('<27><><EFBFBD><EFBFBD>');
|
||||||
|
hex('<27><><EFBFBD><EFBFBD>')
|
||||||
|
D4C5D3D4
|
||||||
|
SET character_set_connection=cp1251;
|
||||||
|
SELECT hex('<27><><EFBFBD><EFBFBD>');
|
||||||
|
hex('<27><><EFBFBD><EFBFBD>')
|
||||||
|
F2E5F1F2
|
||||||
|
@ -45,3 +45,8 @@ SHOW TABLES;
|
|||||||
SHOW TABLES IN <20><><EFBFBD><EFBFBD>;
|
SHOW TABLES IN <20><><EFBFBD><EFBFBD>;
|
||||||
SET CHARACTER SET koi8r;
|
SET CHARACTER SET koi8r;
|
||||||
DROP DATABASE <20><><EFBFBD><EFBFBD>;
|
DROP DATABASE <20><><EFBFBD><EFBFBD>;
|
||||||
|
|
||||||
|
SET NAMES koi8r;
|
||||||
|
SELECT hex('<27><><EFBFBD><EFBFBD>');
|
||||||
|
SET character_set_connection=cp1251;
|
||||||
|
SELECT hex('<27><><EFBFBD><EFBFBD>');
|
||||||
|
@ -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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user