diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-10-28 10:55:44 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-10-28 10:55:44 +0300 |
| commit | 22fe8e10e297c40bc88104fb6a13e5183238850e (patch) | |
| tree | 76a0977cebe3775f61ae3281cc608601eb883243 /sql/sql_parse.cc | |
| parent | a4068d17fdf56ee79e4d538d47799ca0eeb67de3 (diff) | |
| parent | cd6e15989044e5d4a708a6ee191bcd3c13dc0071 (diff) | |
| download | mariadb-git-22fe8e10e297c40bc88104fb6a13e5183238850e.tar.gz | |
Merge 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 bd417231d4b..69e277659e5 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" @@ -1677,9 +1678,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"); @@ -2394,6 +2395,7 @@ case SQLCOM_PREPARE: 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)) |