summaryrefslogtreecommitdiff
path: root/sql/sys_vars.cc
diff options
context:
space:
mode:
authorMagne Mahre <magne.mahre@sun.com>2010-02-17 10:18:17 +0100
committerMagne Mahre <magne.mahre@sun.com>2010-02-17 10:18:17 +0100
commit7178879c8036277075ef2c83265e5cbb01e0cf22 (patch)
treeaaccb83f92ede50e6323716295584410abd5c643 /sql/sys_vars.cc
parent6270e3be3caea3fd478f4ba8042012ffc4cca07f (diff)
downloadmariadb-git-7178879c8036277075ef2c83265e5cbb01e0cf22.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. client/mysql.cc: --no-auto-rehash (-A) is no longer deprecated --no-named-commands (-g) is now removed --skip-line-numbers (-L) is no longer deprecated --set-variable (-O) is now removed --no-pager is now removed client/mysqlbinlog.cc: --position is now removed (use --start-position) -j is now equivalent with --start-position client/mysqldump.c: --first-slave is now removed --no-set-names (-N) is now removed --set-variable (-O) is now removed mysql-test/include/default_mysqld.cnf: default-character-set is removed as an option character-set-server is equivalent. mysql-test/t/bug47671-master.opt: default-character-set option is removed character-set-server is equivalent mysql-test/t/ctype_latin1_de-master.opt: default-character-set option is removed character-set-server is equivalent mysql-test/t/ctype_ucs2_def-master.opt: default-collation is removed collation-server is equicalent scripts/mysqld_multi.sh: --config-file has been superseded by --defaults-extra-file sql/mysql_priv.h: Removed the version number in the deprecation warning text, as decided by ServerPT. sql/mysqld.cc: --default-character-set (-C) is removed --default-collation is removed --log-long-format (-0) is removed --safe-show-database is removed --set-variable (-O) is removed sql/sql_yacc.yy: The FRAC_SECOND keyword is removed sql/sys_vars.cc: The sql_log_update system variable is removed
Diffstat (limited to 'sql/sys_vars.cc')
-rw-r--r--sql/sys_vars.cc24
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,