diff options
| author | Georgi Kodinov <kgeorge@mysql.com> | 2008-10-08 15:19:55 +0300 |
|---|---|---|
| committer | Georgi Kodinov <kgeorge@mysql.com> | 2008-10-08 15:19:55 +0300 |
| commit | 835cbfd34896ad1175fa0e71b7e40e4a8f30fef5 (patch) | |
| tree | 9ec845aa41c65f6e17404abe0ffd95214594c535 /sql/set_var.cc | |
| parent | 6d54b0443a55142263754e0f7a6a36a5bafc2a21 (diff) | |
| parent | 9846ab0a70241945f59e1f474137546dcbd66ed8 (diff) | |
| download | mariadb-git-835cbfd34896ad1175fa0e71b7e40e4a8f30fef5.tar.gz | |
merge 5.1-bugteam -> bug 32124 5.1 tree
Diffstat (limited to 'sql/set_var.cc')
| -rw-r--r-- | sql/set_var.cc | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index f1b9f5e4107..3e15cce2cea 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -2278,6 +2278,12 @@ end: bool sys_var_log_state::update(THD *thd, set_var *var) { bool res; + + if (this == &sys_var_log) + WARN_DEPRECATED(thd, "7.0", "@@log", "'@@general_log'"); + else if (this == &sys_var_log_slow) + WARN_DEPRECATED(thd, "7.0", "@@log_slow_queries", "'@@slow_query_log'"); + pthread_mutex_lock(&LOCK_global_system_variables); if (!var->save_result.ulong_value) { @@ -2292,6 +2298,11 @@ bool sys_var_log_state::update(THD *thd, set_var *var) void sys_var_log_state::set_default(THD *thd, enum_var_type type) { + if (this == &sys_var_log) + WARN_DEPRECATED(thd, "7.0", "@@log", "'@@general_log'"); + else if (this == &sys_var_log_slow) + WARN_DEPRECATED(thd, "7.0", "@@log_slow_queries", "'@@slow_query_log'"); + pthread_mutex_lock(&LOCK_global_system_variables); logger.deactivate_log_handler(thd, log_type); pthread_mutex_unlock(&LOCK_global_system_variables); @@ -3598,7 +3609,7 @@ bool sys_var_thd_storage_engine::update(THD *thd, set_var *var) void sys_var_thd_table_type::warn_deprecated(THD *thd) { - WARN_DEPRECATED(thd, "5.2", "table_type", "'storage_engine'"); + WARN_DEPRECATED(thd, "5.2", "@@table_type", "'@@storage_engine'"); } void sys_var_thd_table_type::set_default(THD *thd, enum_var_type type) @@ -3860,8 +3871,8 @@ bool process_key_caches(process_key_cache_t func) void sys_var_trust_routine_creators::warn_deprecated(THD *thd) { - WARN_DEPRECATED(thd, "5.2", "log_bin_trust_routine_creators", - "'log_bin_trust_function_creators'"); + WARN_DEPRECATED(thd, "5.2", "@@log_bin_trust_routine_creators", + "'@@log_bin_trust_function_creators'"); } void sys_var_trust_routine_creators::set_default(THD *thd, enum_var_type type) |