mirror of
https://github.com/MariaDB/server.git
synced 2026-05-15 19:37:16 +02:00
Deprecated the update log (Sprint task #792). Now --log-update
just turns on --log-bin and prints a warning. SQL_LOG_UPDATE is handled in two ways (see mysqld.cc for comments). include/mysqld_error.h: deprecated update log sql/log.cc: deprecated update log sql/mysqld.cc: deprecated update log sql/set_var.cc: deprecated update log sql/share/czech/errmsg.txt: deprecated update log sql/share/danish/errmsg.txt: deprecated update log sql/share/dutch/errmsg.txt: deprecated update log sql/share/english/errmsg.txt: deprecated update log sql/share/estonian/errmsg.txt: deprecated update log sql/share/french/errmsg.txt: deprecated update log sql/share/german/errmsg.txt: deprecated update log sql/share/greek/errmsg.txt: deprecated update log sql/share/hungarian/errmsg.txt: deprecated update log sql/share/italian/errmsg.txt: deprecated update log sql/share/japanese/errmsg.txt: deprecated update log sql/share/korean/errmsg.txt: deprecated update log sql/share/norwegian-ny/errmsg.txt: deprecated update log sql/share/norwegian/errmsg.txt: deprecated update log sql/share/polish/errmsg.txt: deprecated update log sql/share/portuguese/errmsg.txt: deprecated update log sql/share/romanian/errmsg.txt: deprecated update log sql/share/russian/errmsg.txt: deprecated update log sql/share/serbian/errmsg.txt: deprecated update log sql/share/slovak/errmsg.txt: deprecated update log sql/share/spanish/errmsg.txt: deprecated update log sql/share/swedish/errmsg.txt: deprecated update log sql/share/ukrainian/errmsg.txt: deprecated update log sql/sql_acl.cc: deprecated update log sql/sql_db.cc: deprecated update log sql/sql_delete.cc: deprecated update log sql/sql_insert.cc: deprecated update log sql/sql_load.cc: deprecated update log sql/sql_parse.cc: deprecated update log sql/sql_rename.cc: deprecated update log sql/sql_table.cc: deprecated update log sql/sql_update.cc: deprecated update log
This commit is contained in:
parent
60e7ad754f
commit
590d769e2c
36 changed files with 157 additions and 92 deletions
|
|
@ -78,6 +78,7 @@ static void sys_set_default_charset(THD *thd, enum_var_type type);
|
|||
static bool set_option_bit(THD *thd, set_var *var);
|
||||
static bool set_option_autocommit(THD *thd, set_var *var);
|
||||
static bool set_log_update(THD *thd, set_var *var);
|
||||
static bool set_log_bin(THD *thd, set_var *var);
|
||||
static void fix_low_priority_updates(THD *thd, enum_var_type type);
|
||||
static void fix_tx_isolation(THD *thd, enum_var_type type);
|
||||
static void fix_net_read_timeout(THD *thd, enum_var_type type);
|
||||
|
|
@ -265,7 +266,7 @@ static sys_var_thd_bit sys_log_update("sql_log_update",
|
|||
set_log_update,
|
||||
OPTION_UPDATE_LOG);
|
||||
static sys_var_thd_bit sys_log_binlog("sql_log_bin",
|
||||
set_log_update,
|
||||
set_log_bin,
|
||||
OPTION_BIN_LOG);
|
||||
static sys_var_thd_bit sys_sql_warnings("sql_warnings",
|
||||
set_option_bit,
|
||||
|
|
@ -1363,6 +1364,30 @@ static bool set_option_autocommit(THD *thd, set_var *var)
|
|||
|
||||
|
||||
static bool set_log_update(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)
|
||||
{
|
||||
((sys_var_thd_bit*) var->var)->bit_flag|= (OPTION_BIN_LOG |
|
||||
OPTION_UPDATE_LOG);
|
||||
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));
|
||||
set_option_bit(thd, var);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static bool set_log_bin(THD *thd, set_var *var)
|
||||
{
|
||||
if (opt_sql_bin_update)
|
||||
((sys_var_thd_bit*) var->var)->bit_flag|= (OPTION_BIN_LOG |
|
||||
|
|
@ -1371,6 +1396,7 @@ static bool set_log_update(THD *thd, set_var *var)
|
|||
return 0;
|
||||
}
|
||||
|
||||
|
||||
static byte *get_warning_count(THD *thd)
|
||||
{
|
||||
thd->sys_var_tmp.long_value=
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue