database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-31 22:22:30 +03:00
Code Activity

Manual merge 5.1-rep+2 to 5.1-rep+3

Browse Source
This commit is contained in:
He Zhenxing
2009-10-18 11:57:38 +08:00
parent 73b296c4c4 c1584c9801
commit ae107c5581
372 changed files with 15369 additions and 2607 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_parse.cc
View File

@@ -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))