diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-02-23 18:49:21 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-02-23 18:49:21 +0300 |
| commit | 1dd2f90faf79eb1b194c9af0cde987c8a7b3058f (patch) | |
| tree | df9457baf92d1aba63e31cc13fdfe0cc6b6e4be6 /sql/sys_vars.cc | |
| parent | fcc9c8627a54f68ffe7c2f225d20a9f8c1016a08 (diff) | |
| parent | 0a8a9a3fc083fbaf44ce2b59d4995af9950f11b4 (diff) | |
| download | mariadb-git-1dd2f90faf79eb1b194c9af0cde987c8a7b3058f.tar.gz | |
Auto-merge from mysql-next-mr-bugfixing.
Diffstat (limited to 'sql/sys_vars.cc')
| -rw-r--r-- | sql/sys_vars.cc | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index 4575ca79049..ba970925fc6 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -2205,30 +2205,6 @@ static Sys_var_bit Sys_log_binlog( DEFAULT(TRUE), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(check_has_super), ON_UPDATE(fix_sql_log_bin)); -static bool deprecated_log_update(sys_var *self, THD *thd, set_var *var) -{ - /* - The update log is not supported anymore since 5.0. - See sql/mysqld.cc/, comments in function init_server_components() for an - explaination of the different warnings we send below - */ - - if (opt_sql_bin_update) - push_warning(thd, MYSQL_ERROR::WARN_LEVEL_NOTE, - ER_UPDATE_LOG_DEPRECATED_TRANSLATED, - ER(ER_UPDATE_LOG_DEPRECATED_TRANSLATED)); - else - push_warning(thd, MYSQL_ERROR::WARN_LEVEL_NOTE, - ER_UPDATE_LOG_DEPRECATED_IGNORED, - ER(ER_UPDATE_LOG_DEPRECATED_IGNORED)); - return check_has_super(self, thd, var); -} -static Sys_var_bit Sys_log_update( - "sql_log_update", "alias for sql_log_bin", - SESSION_VAR(option_bits), NO_CMD_LINE, OPTION_BIN_LOG, - DEFAULT(TRUE), NO_MUTEX_GUARD, NOT_IN_BINLOG, - ON_CHECK(deprecated_log_update), ON_UPDATE(fix_sql_log_bin)); - static Sys_var_bit Sys_sql_warnings( "sql_warnings", "sql_warnings", SESSION_VAR(option_bits), NO_CMD_LINE, OPTION_WARNINGS, |