diff options
| author | Magne Mahre <magne.mahre@sun.com> | 2010-02-17 10:18:17 +0100 |
|---|---|---|
| committer | Magne Mahre <magne.mahre@sun.com> | 2010-02-17 10:18:17 +0100 |
| commit | 1f7f620f3042a5b9c08912ae64b92c129e03065f (patch) | |
| tree | aaccb83f92ede50e6323716295584410abd5c643 /sql/sys_vars.cc | |
| parent | 775fd3ec7131b71ab2bc6b4d958a6fe711f767b0 (diff) | |
| download | mariadb-git-1f7f620f3042a5b9c08912ae64b92c129e03065f.tar.gz | |
WL#5154 Remove deprecated 4.1 features
A set of program options and variables was deprecated in
MySQL 5.1, and is hereby removed.
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 eef403e1a86..8f71d27e8d4 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -2203,30 +2203,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, |