diff options
author | Satya B <satya.bn@sun.com> | 2009-12-17 17:15:13 +0530 |
---|---|---|
committer | Satya B <satya.bn@sun.com> | 2009-12-17 17:15:13 +0530 |
commit | bbf079cf2cdee06b2a96cc520a10f33f28754ad3 (patch) | |
tree | 4c93c836980d7cf93eeacca6d20f05143aec86f5 /sql/set_var.cc | |
parent | 4621d480fc476127722e7a14656051edebb3673c (diff) | |
parent | cf9966f86f3c6245f33342f2f5498a0c5efa96e4 (diff) | |
download | mariadb-git-bbf079cf2cdee06b2a96cc520a10f33f28754ad3.tar.gz |
merge mysql-5.0-bugteam to mysql-5.1-bugteam
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 b80bdde9670..3c6b259045d 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -147,6 +147,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 @@ -898,6 +899,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) @@ -3175,6 +3180,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 |