database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

SET CHARACTER SET DEFAULT didn't work (Bug #462)

Browse Source 
BUILD/compile-pentium-debug-max:
  Removed -DBIG_TABLES because of problems with gdb 5.3
sql/set_var.cc:
  SET CHARACTER SET DEFAULT didn't work
sql/set_var.h:
  SET CHARACTER SET DEFAULT didn't work
This commit is contained in:
unknown
2003-06-29 12:58:43 +03:00
parent 5768f4a34e
commit e224c1238d
5 changed files with 35 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BUILD/compile-pentium-debug-max
View File

@ -3,7 +3,7 @@
path=`dirname $0` path=`dirname $0`
. "$path/SETUP.sh" . "$path/SETUP.sh"
extra_flags="$pentium_cflags $debug_cflags -DBIG_TABLES" extra_flags="$pentium_cflags $debug_cflags"
c_warnings="$c_warnings $debug_extra_warnings" c_warnings="$c_warnings $debug_extra_warnings"
cxx_warnings="$cxx_warnings $debug_extra_warnings" cxx_warnings="$cxx_warnings $debug_extra_warnings"
extra_configs="$pentium_configs $debug_configs" extra_configs="$pentium_configs $debug_configs"

17
mysql-test/r/convert.result Normal file
View File

@ -0,0 +1,17 @@
select @@convert_character_set;
@@convert_character_set
select @@global.convert_character_set;
@@global.convert_character_set
show variables like "%convert_character_set%";
Variable_name Value
convert_character_set
SET CHARACTER SET cp1251_koi8;
select @@convert_character_set;
@@convert_character_set
cp1251_koi8
SET CHARACTER SET DEFAULT;
select @@convert_character_set;
@@convert_character_set

11
mysql-test/t/convert.test Normal file
View File

@ -0,0 +1,11 @@
# Test of character set conversions
# Test that SET DEFAULT works
select @@convert_character_set;
select @@global.convert_character_set;
show variables like "%convert_character_set%";
SET CHARACTER SET cp1251_koi8;
select @@convert_character_set;
SET CHARACTER SET DEFAULT;
select @@convert_character_set;

5
sql/set_var.cc
View File

@ -1083,6 +1083,11 @@ byte *sys_var_thd_conv_charset::value_ptr(THD *thd, enum_var_type type)
} }
void sys_var_thd_conv_charset::set_default(THD *thd, enum_var_type type)
{
thd->variables.convert_set= global_system_variables.convert_set;
}
bool sys_var_timestamp::update(THD *thd, set_var *var) bool sys_var_timestamp::update(THD *thd, set_var *var)
{ {

1
sql/set_var.h
View File

@ -412,6 +412,7 @@ public:
return type != STRING_RESULT; /* Only accept strings */ return type != STRING_RESULT; /* Only accept strings */
} }
bool check_default(enum_var_type type) { return 0; } bool check_default(enum_var_type type) { return 0; }
void set_default(THD *thd, enum_var_type type);
}; };