diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-05-20 14:57:29 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-05-20 14:57:29 +0200 |
| commit | 7f6f53a8df10c76f93848c8d06bc5af71051c525 (patch) | |
| tree | 9a539823cdf05f53574fdf91941b3a242025acba /sql/sql_parse.cc | |
| parent | 0e7e724d6b36b2f5b8a0604171adb750d7c82c9c (diff) | |
| parent | 280fcf08085e43b5359ec79c0e34166e51b3ebd8 (diff) | |
| download | mariadb-git-7f6f53a8df10c76f93848c8d06bc5af71051c525.tar.gz | |
5.2 merge
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index e84750369f9..f135789fb57 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -1685,8 +1685,9 @@ void log_slow_statement(THD *thd) ulonglong end_utime_of_query= thd->current_utime(); thd_proc_info(thd, "logging slow query"); - if (((end_utime_of_query - thd->utime_after_lock) > - thd->variables.long_query_time || + if ((((end_utime_of_query > thd->utime_after_lock) && + ((end_utime_of_query - thd->utime_after_lock) > + thd->variables.long_query_time)) || ((thd->server_status & (SERVER_QUERY_NO_INDEX_USED | SERVER_QUERY_NO_GOOD_INDEX_USED)) && opt_log_queries_not_using_indexes && |