mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 21:12:26 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bug fix:

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

The above sequence failed in some cases.
This commit is contained in:
bar@bar.mysql.r18.ru 2003-09-16 17:14:23 +05:00
parent 1932b40c13
commit fb4f5e7d42
3 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
mysql-test/r/ctype_recoding.result
View file

@ -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

5
mysql-test/t/ctype_recoding.test
View file

@ -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('ÔÅÓÔ');

1
sql/set_var.cc
View file

@ -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;
} }