diff options
| author | Tatiana A. Nurnberg <azundris@mysql.com> | 2008-10-06 11:29:42 +0200 |
|---|---|---|
| committer | Tatiana A. Nurnberg <azundris@mysql.com> | 2008-10-06 11:29:42 +0200 |
| commit | 07953513edc3e5956d485bec0e6067f5e864a7db (patch) | |
| tree | 361e50644473af169ce001ffa74d09399d92eaf1 /sql/set_var.cc | |
| parent | 53e0108387ff875ea34eb744badcd5a5551cbd3a (diff) | |
| download | mariadb-git-07953513edc3e5956d485bec0e6067f5e864a7db.tar.gz | |
WL#4403 deprecate @log and @slow_log_queries variables
Adds --general_log_file, --slow_query_log_file command-
line options to match system variables of the same names.
Deprecates --log, --log-slow-queries command-line options
and log, log_slow_queries system-variables for v7.0; they
are superseded by general_log/general_log_file and
slow_query_log/slow_query_log_file, respectively.
mysql-test/r/log_basic.result:
Change deprecated system variable "log" to
general log.
mysql-test/r/log_state.result:
Show that all log-related server variables that
should throw deprecation warnings do, and the
others don't.
mysql-test/t/log_basic.test:
Change deprecated system variable "log" to
general log.
mysql-test/t/log_state.test:
Show that all log-related server variables that
should throw deprecation warnings do, and the
others don't.
sql/mysqld.cc:
Add command-line options --general_log_file and
--slow_query_log_file to match server options of
the same name.
Deprecated --log and --log-slow-queries command-line
options; they are superseded by --general-log/
--general-log-file and --slow-query-log/--slow-query-log-file,
respectively
sql/set_var.cc:
Deprecate system-variables log in favour of general_log,
log_slow_queries in favour of slow_query_log for 7.0,
both for value- and DEFAULT-setting.
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 4259c3a6aaf..a62cafc3873 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -2391,6 +2391,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) { @@ -2405,6 +2411,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); @@ -3711,7 +3722,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) @@ -3973,8 +3984,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) |