diff options
| author | He Zhenxing <zhenxing.he@sun.com> | 2009-10-18 11:57:38 +0800 |
|---|---|---|
| committer | He Zhenxing <zhenxing.he@sun.com> | 2009-10-18 11:57:38 +0800 |
| commit | ae107c55811078b2154911accdeafb32d6b97271 (patch) | |
| tree | a17e4b5853a3e4a0c4dcfcf7083591ba01362f80 /sql/sql_parse.cc | |
| parent | 73b296c4c4d7c03528f33f0c6f1c91905ec7b8e6 (diff) | |
| parent | c1584c98010515b3c51c1d0987b824182e0610aa (diff) | |
| download | mariadb-git-ae107c55811078b2154911accdeafb32d6b97271.tar.gz | |
Manual merge 5.1-rep+2 to 5.1-rep+3
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 8dc3195044e..6eb2b1879c1 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" @@ -1615,9 +1616,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"); @@ -2319,6 +2320,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)) |