diff options
| author | unknown <bar@bar.mysql.r18.ru> | 2003-05-21 13:59:00 +0500 |
|---|---|---|
| committer | unknown <bar@bar.mysql.r18.ru> | 2003-05-21 13:59:00 +0500 |
| commit | 2e2741913df3d03649d8fff3539520f2e4c4b074 (patch) | |
| tree | e8b2156f4d9545f88f277fa501ae750643638097 /sql/set_var.cc | |
| parent | 389f70dedd03ca1c980b9df7cb5d6082da01ebd0 (diff) | |
| parent | 4dbef8c2e3a432dc2efc9f91270e1e1ea53a8399 (diff) | |
| download | mariadb-git-2e2741913df3d03649d8fff3539520f2e4c4b074.tar.gz | |
Merge abarkov@build.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
sql/set_var.cc:
Auto merged
Diffstat (limited to 'sql/set_var.cc')
| -rw-r--r-- | sql/set_var.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index e8ae9b90a6c..c9b8584e672 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -105,6 +105,10 @@ sys_var_str sys_charset("character_set", sys_check_charset, sys_update_charset, sys_set_default_charset); +sys_var_str sys_charset_system("character_set_system", + sys_check_charset, + sys_update_charset, + sys_set_default_charset); sys_var_collation_client sys_collation_client("collation_client"); sys_var_collation_connection sys_collation_connection("collation_connection"); sys_var_collation_results sys_collation_results("collation_results"); @@ -463,8 +467,8 @@ struct show_var_st init_vars[]= { #endif {sys_binlog_cache_size.name,(char*) &sys_binlog_cache_size, SHOW_SYS}, {sys_bulk_insert_buff_size.name,(char*) &sys_bulk_insert_buff_size,SHOW_SYS}, - {sys_charset.name, (char*) &sys_charset, SHOW_SYS}, - {"character_sets", (char*) &charsets_list, SHOW_CHAR_PTR}, + {sys_charset.name, (char*) &sys_charset, SHOW_SYS}, + {sys_charset_system.name, (char*) &sys_charset_system, SHOW_SYS}, {sys_collation_client.name, (char*) &sys_collation_client, SHOW_SYS}, {sys_collation_connection.name,(char*) &sys_collation_connection, SHOW_SYS}, {sys_collation_results.name, (char*) &sys_collation_results, SHOW_SYS}, |