fix lag detection - do not assume that second 'system user' line gives that value...

diff --git a/includes/Database.php b/includes/Database.php
index 9bb92e0..7af8bd9 100644 (file)
--- a/includes/Database.php
+++ b/includes/Database.php
@@ -1812,14 +1812,18 @@ class Database {
                # dubious, but unfortunately there's no easy rigorous way
                $slaveThreads = 0;
                while ( $row = $this->fetchObject( $res ) ) {
-                       if ( $row->User == 'system user' ) {
-                               if ( ++$slaveThreads == 2 ) {
-                                       # This is it, return the time (except -ve)
-                                       if ( $row->Time > 0x7fffffff ) {
-                                               return false;
-                                       } else {
-                                               return $row->Time;
-                                       }
+                       /* This should work for most situations - when default db 
+                        * for thread is not specified, it had no events executed, 
+                        * and therefore it doesn't know yet how lagged it is.
+                        *
+                        * Relay log I/O thread does not select databases.
+                        */
+                       if ( $row->User == 'system user' && $row->db != '' ) {
+                               # This is it, return the time (except -ve)
+                               if ( $row->Time > 0x7fffffff ) {
+                                       return false;
+                               } else {
+                                       return $row->Time;
                                }
                        }
                }