summaryrefslogtreecommitdiff
path: root/sql/log.cc
diff options
context:
space:
mode:
authorunknown <guilhem@mysql.com>2003-04-02 00:15:20 +0200
committerunknown <guilhem@mysql.com>2003-04-02 00:15:20 +0200
commit590d769e2cbf9c3f7a0c39ae37a2da6976bde94b (patch)
treebb10c16185835ad671982d8e96e1f97b44d9ba97 /sql/log.cc
parent60e7ad754f2f0467a9419c50714f43f4701f88f2 (diff)
downloadmariadb-git-590d769e2cbf9c3f7a0c39ae37a2da6976bde94b.tar.gz
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
Diffstat (limited to 'sql/log.cc')
-rw-r--r--sql/log.cc13
1 files changed, 3 insertions, 10 deletions
diff --git a/sql/log.cc b/sql/log.cc
index cd4c2a38ac8..74afcef3ac5 100644
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -30,7 +30,7 @@
#include <stdarg.h>
#include <m_ctype.h> // For test_if_number
-MYSQL_LOG mysql_log,mysql_update_log,mysql_slow_log,mysql_bin_log;
+MYSQL_LOG mysql_log, mysql_slow_log, mysql_bin_log;
extern I_List<i_string> binlog_do_db, binlog_ignore_db;
static bool test_if_number(const char *str,
@@ -1020,7 +1020,7 @@ err:
/*
Write to normal (not rotable) log
- This is the format for the 'normal', 'slow' and 'update' logs.
+ This is the format for the 'normal' log.
*/
bool MYSQL_LOG::write(THD *thd,enum enum_server_command command,
@@ -1392,8 +1392,7 @@ err:
/*
- Write update log in a format suitable for incremental backup
- This is also used by the slow query log.
+ Write to the slow query log.
*/
bool MYSQL_LOG::write(THD *thd,const char *query, uint query_length,
@@ -1409,12 +1408,6 @@ bool MYSQL_LOG::write(THD *thd,const char *query, uint query_length,
int tmp_errno=0;
char buff[80],*end;
end=buff;
- if (!(thd->options & OPTION_UPDATE_LOG) &&
- (thd->master_access & SUPER_ACL))
- {
- VOID(pthread_mutex_unlock(&LOCK_log));
- return 0;
- }
if ((specialflag & SPECIAL_LONG_LOG_FORMAT) || query_start_arg)
{
current_time=time(NULL);