diff options
| author | unknown <knielsen@knielsen-hq.org> | 2010-03-09 20:23:30 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2010-03-09 20:23:30 +0100 |
| commit | 214edde888376972160d5f44b44f8033fb2056f5 (patch) | |
| tree | 4e27e497bafc7caf79bcd02aa33ac3c89e06ddf6 /sql/set_var.cc | |
| parent | 700e2155f28a16756e8c30587ce9baa4d7d9bf32 (diff) | |
| parent | c9dffa993a845752a847c4fe36c99cc6adbc35a8 (diff) | |
| download | mariadb-git-214edde888376972160d5f44b44f8033fb2056f5.tar.gz | |
Automerge MySQL 5.1.44 merge into MariaDB trunk.
Diffstat (limited to 'sql/set_var.cc')
| -rw-r--r-- | sql/set_var.cc | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index d58ac9d00b1..2adec7e7f0a 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -151,6 +151,7 @@ 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 void fix_sys_log_slow_filter(THD *thd, enum_var_type); +static uchar *get_myisam_mmap_size(THD *thd); /* Variable definition list @@ -184,6 +185,8 @@ static sys_var_long_ptr sys_binlog_cache_size(&vars, "binlog_cache_size", &binlog_cache_size); static sys_var_thd_binlog_format sys_binlog_format(&vars, "binlog_format", &SV::binlog_format); +static sys_var_thd_bool sys_binlog_direct_non_trans_update(&vars, "binlog_direct_non_transactional_updates", + &SV::binlog_direct_non_trans_update); static sys_var_thd_ulong sys_bulk_insert_buff_size(&vars, "bulk_insert_buffer_size", &SV::bulk_insert_buff_size); static sys_var_const_os sys_character_sets_dir(&vars, @@ -939,6 +942,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) @@ -3275,6 +3282,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 @@ -4183,7 +4196,7 @@ bool process_key_caches(process_key_cache_t func) void sys_var_trust_routine_creators::warn_deprecated(THD *thd) { - WARN_DEPRECATED(thd, "6.0", "@@log_bin_trust_routine_creators", + WARN_DEPRECATED(thd, VER_CELOSIA, "@@log_bin_trust_routine_creators", "'@@log_bin_trust_function_creators'"); } |