diff options
| author | unknown <bar@mysql.com> | 2006-02-14 08:25:09 +0400 |
|---|---|---|
| committer | unknown <bar@mysql.com> | 2006-02-14 08:25:09 +0400 |
| commit | 3c9952a1ae437eacb7f52a5e9519d63b410d4424 (patch) | |
| tree | 827adff8d5c84146b0cab1d94362feffac894161 /sql/set_var.cc | |
| parent | 10c6505550d1b0c00f60b701447262021fc66138 (diff) | |
| parent | 7ce3b2a3811b993412783a31bcb7bac186eab928 (diff) | |
| download | mariadb-git-3c9952a1ae437eacb7f52a5e9519d63b410d4424.tar.gz | |
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/bar/mysql-5.0.cs_fs
sql/set_var.cc:
Auto merged
Diffstat (limited to 'sql/set_var.cc')
| -rw-r--r-- | sql/set_var.cc | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index 5b99085ba6c..02216fb2113 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -148,6 +148,7 @@ sys_var_character_set_database sys_character_set_database("character_set_databas sys_var_character_set_client sys_character_set_client("character_set_client"); sys_var_character_set_connection sys_character_set_connection("character_set_connection"); sys_var_character_set_results sys_character_set_results("character_set_results"); +sys_var_character_set_filesystem sys_character_set_filesystem("character_set_filesystem"); sys_var_thd_ulong sys_completion_type("completion_type", &SV::completion_type, check_completion_type, @@ -580,6 +581,7 @@ sys_var *sys_variables[]= &sys_character_set_client, &sys_character_set_connection, &sys_character_set_results, + &sys_character_set_filesystem, &sys_charset_system, &sys_collation_connection, &sys_collation_database, @@ -771,6 +773,7 @@ struct show_var_st init_vars[]= { {sys_character_set_client.name,(char*) &sys_character_set_client, SHOW_SYS}, {sys_character_set_connection.name,(char*) &sys_character_set_connection,SHOW_SYS}, {sys_character_set_database.name, (char*) &sys_character_set_database,SHOW_SYS}, + {sys_character_set_filesystem.name,(char*) &sys_character_set_filesystem, SHOW_SYS}, {sys_character_set_results.name,(char*) &sys_character_set_results, SHOW_SYS}, {sys_character_set_server.name, (char*) &sys_character_set_server,SHOW_SYS}, {sys_charset_system.name, (char*) &sys_charset_system, SHOW_SYS}, @@ -2077,6 +2080,32 @@ void sys_var_character_set_client::set_default(THD *thd, enum_var_type type) CHARSET_INFO ** +sys_var_character_set_filesystem::ci_ptr(THD *thd, enum_var_type type) +{ + if (type == OPT_GLOBAL) + return &global_system_variables.character_set_filesystem; + else + return &thd->variables.character_set_filesystem; +} + + +extern CHARSET_INFO *character_set_filesystem; + +void +sys_var_character_set_filesystem::set_default(THD *thd, enum_var_type type) +{ + if (type == OPT_GLOBAL) + global_system_variables.character_set_filesystem= character_set_filesystem; + else + { + thd->variables.character_set_filesystem= (global_system_variables. + character_set_filesystem); + thd->update_charset(); + } +} + + +CHARSET_INFO ** sys_var_character_set_results::ci_ptr(THD *thd, enum_var_type type) { if (type == OPT_GLOBAL) |