diff options
| author | Konstantin Osipov <kostja@sun.com> | 2010-02-02 12:22:17 +0300 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2010-02-02 12:22:17 +0300 |
| commit | c6c1ddabaf2d41b362921524d617fbc772c1c9b6 (patch) | |
| tree | 919a1043e20b3f1f6a58331ae90a4a9529b0ab5e /sql/set_var.cc | |
| parent | 665100b69dfebe45e2d3b68116c6718560bf63b2 (diff) | |
| parent | d4f23f0cf6db38731a161c5c7b0b056fc67e5c02 (diff) | |
| download | mariadb-git-c6c1ddabaf2d41b362921524d617fbc772c1c9b6.tar.gz | |
Merge next-mr -> next-4284.
Diffstat (limited to 'sql/set_var.cc')
| -rw-r--r-- | sql/set_var.cc | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index 0f36a164247..5509e1dfc61 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -150,6 +150,7 @@ static bool sys_update_general_log_path(THD *thd, set_var * var); static void sys_default_general_log_path(THD *thd, enum_var_type type); static bool sys_update_slow_log_path(THD *thd, set_var * var); static void sys_default_slow_log_path(THD *thd, enum_var_type type); +static uchar *get_myisam_mmap_size(THD *thd); /* Variable definition list @@ -902,6 +903,10 @@ sys_var_str sys_var_slow_log_path(&vars, "slow_query_log_file", sys_check_log_pa opt_slow_logname); static sys_var_log_output sys_var_log_output_state(&vars, "log_output", &log_output_options, &log_output_typelib, 0); +static sys_var_readonly sys_myisam_mmap_size(&vars, "myisam_mmap_size", + OPT_GLOBAL, + SHOW_LONGLONG, + get_myisam_mmap_size); bool sys_var::check(THD *thd, set_var *var) @@ -3307,6 +3312,12 @@ static uchar *get_tmpdir(THD *thd) return (uchar*)mysql_tmpdir; } +static uchar *get_myisam_mmap_size(THD *thd) +{ + return (uchar *)&myisam_mmap_size; +} + + /**************************************************************************** Main handling of variables: - Initialisation |