summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorunknown <jani@hynda.mysql.fi>2001-08-10 12:40:49 +0300
committerunknown <jani@hynda.mysql.fi>2001-08-10 12:40:49 +0300
commite24443b04bda0ca59db61a016637e7ab644fff8c (patch)
treef56ec704ecb93a6f588975044c5068017c512652 /sql
parent83fbd8d8db6939775bd0b13e9ef2aa40fb0acbea (diff)
downloadmariadb-git-e24443b04bda0ca59db61a016637e7ab644fff8c.tar.gz
changed variable display from string to int (bits) for myisam-recover
and sql-mode options. sql/mysqld.cc: Changed the sql-mode to be shown as a number (bits) instead of a string.
Diffstat (limited to 'sql')
-rw-r--r--sql/mysqld.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 36ee127580c..2d7d53919a6 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -2850,7 +2850,7 @@ struct show_var_st init_vars[]= {
{"max_user_connections", (char*) &max_user_connections, SHOW_LONG},
{"max_tmp_tables", (char*) &max_tmp_tables, SHOW_LONG},
{"max_write_lock_count", (char*) &max_write_lock_count, SHOW_LONG},
- {"myisam_recover_options", (char*) &myisam_recover_options_str, SHOW_CHAR_PTR},
+ {"myisam_recover_options", (char*) &myisam_recover_options, SHOW_LONG},
{"myisam_max_extra_sort_file_size", (char*) &myisam_max_extra_sort_file_size,
SHOW_LONG},
{"myisam_max_sort_file_size",(char*) &myisam_max_sort_file_size, SHOW_LONG},
@@ -2874,7 +2874,7 @@ struct show_var_st init_vars[]= {
{"slow_launch_time", (char*) &slow_launch_time, SHOW_LONG},
{"socket", (char*) &mysql_unix_port, SHOW_CHAR_PTR},
{"sort_buffer", (char*) &sortbuff_size, SHOW_LONG},
- {"sql_mode", (char*) &sql_mode_str, SHOW_CHAR_PTR},
+ {"sql_mode", (char*) &opt_sql_mode, SHOW_LONG},
{"table_cache", (char*) &table_cache_size, SHOW_LONG},
{"table_type", (char*) &default_table_type_name, SHOW_CHAR_PTR},
{"thread_cache_size", (char*) &thread_cache_size, SHOW_LONG},