← Back to team overview

percona-discussion team mailing list archive

[Merge] lp:~percona-dev/percona-patches/5.0.77-fix-bug375494 into lp:percona-patches

 

Yasufumi Kinoshita has proposed merging lp:~percona-dev/percona-patches/5.0.77-fix-bug375494 into lp:percona-patches.

Requested reviews:
    Percona developers (percona-dev)
-- 
https://code.launchpad.net/~percona-dev/percona-patches/5.0.77-fix-bug375494/+merge/6803
Your team Percona developers is subscribed to branch lp:percona-patches.
=== modified file 'microslow_innodb.patch'
--- microslow_innodb.patch	2009-05-20 06:04:48 +0000
+++ microslow_innodb.patch	2009-05-27 01:07:17 +0000
@@ -2330,14 +2330,14 @@
 +    limit, if one of them takes long enough (>= 1 second) it will be sensible 
 +    to make an exception and write to slow log anyway.
 +  */
++
 +  if (opt_use_global_long_query_time)
 +    thd->variables.long_query_time = global_system_variables.long_query_time;
-+  if (thd->write_to_slow_log != TRUE && thd->variables.long_query_time < 1000000 &&
-+      (ulong) (thd->start_timer - thd->timer_after_lock) >= 1000000)
-+    thd->write_to_slow_log= TRUE;
 +
 +  /* Do not log this thread's queries due to rate limiting. */
-+  if (thd->write_to_slow_log != TRUE)
++  if (thd->write_to_slow_log != TRUE
++      && (thd->variables.long_query_time >= 1000000
++          || (ulong) (thd->start_timer - thd->timer_after_lock) < 1000000))
 +    return;
  
    /*


Follow ups