merged 35396 to 5.0-bugteam

b367d2fd · Georgi Kodinov · 334e249f · 37e88536 · b367d2fd
Commit b367d2fd authored Jan 29, 2009 by Georgi Kodinov
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

sql/sql_parse.cc sql/sql_parse.cc +3 -2

No files found.
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -2333,8 +2333,9 @@ void log_slow_statement(THD *thd)
  {
    thd->proc_info="logging slow query";
-    if ((ulong) (thd->start_time - thd->time_after_lock) >
+    if ((thd->start_time > thd->time_after_lock && 
-	thd->variables.long_query_time ||
+         (ulong) (thd->start_time - thd->time_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 &&