diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2009-12-17 18:09:04 +0300 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2009-12-17 18:09:04 +0300 |
| commit | 5069a666709a66335ded54c6fab4832e155840c1 (patch) | |
| tree | 4d0f676967368da9dbb6b7ddde1033a278f2e17c /sql/set_var.cc | |
| parent | 7e15d855f1fbc72bae6c0ee75dd2b61477c2eaff (diff) | |
| parent | 709f49cbf780681bb74707c9ab2438f163747906 (diff) | |
| download | mariadb-git-5069a666709a66335ded54c6fab4832e155840c1.tar.gz | |
Automerge from mysql-5.1-bugteam to mysql-trunk-merge.
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 36597658077..8d88c676cb7 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -149,6 +149,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 @@ -906,6 +907,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) @@ -3308,6 +3313,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 |