diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-10-27 12:59:09 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-10-27 12:59:09 +0300 |
| commit | 47c9089ef5d87e6d8e6aa3bf066f8057b413f2b5 (patch) | |
| tree | 39886654de5469ef82ac29be18f49b0fa0925a6b /sql/sql_parse.cc | |
| parent | 1e5804f2c53e1d9e9c0c2660f0437d7c8294e004 (diff) | |
| parent | 453eb014f7f44cf92fa40887e17a253338c696fb (diff) | |
| download | mariadb-git-47c9089ef5d87e6d8e6aa3bf066f8057b413f2b5.tar.gz | |
Automerge from mysql-next-mr.
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 92ccaa3e4ec..285cd7d0bc3 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -21,6 +21,7 @@ #include <m_ctype.h> #include <myisam.h> #include <my_dir.h> +#include "rpl_handler.h" #include "sp_head.h" #include "sp.h" @@ -1676,9 +1677,9 @@ void log_slow_statement(THD *thd) /* Do not log administrative statements unless the appropriate option is - set; do not log into slow log if reading from backup. + set. */ - if (thd->enable_slow_log && !thd->user_time) + if (thd->enable_slow_log) { ulonglong end_utime_of_query= thd->current_utime(); thd_proc_info(thd, "logging slow query"); @@ -2386,6 +2387,7 @@ mysql_execute_command(THD *thd) res = show_slave_hosts(thd); break; } + case SQLCOM_SHOW_RELAYLOG_EVENTS: /* fall through */ case SQLCOM_SHOW_BINLOG_EVENTS: { if (check_global_access(thd, REPL_SLAVE_ACL)) |