maria-developers team mailing list archive

[knielsen@xxxxxxxxxxxxxxx]

#At lp:maria

 2739 knielsen@xxxxxxxxxxxxxxx	2009-09-29
      Fix race in test of times shown in SHOW FULL PROCESSLIST.
      (These are by their nature difficult to test reliably due to differences in timing).
      modified:
        mysql-test/r/information_schema.result
        mysql-test/t/information_schema.test

=== modified file 'mysql-test/r/information_schema.result'
--- a/mysql-test/r/information_schema.result	2009-09-23 11:03:47 +0000
+++ b/mysql-test/r/information_schema.result	2009-09-29 20:19:43 +0000
@@ -1385,7 +1385,7 @@ who
 other connection here
 SELECT IF(`time` > 0, 'OK', `time`) AS time_low,
 IF(`time` < 1000, 'OK', `time`) AS time_high,
-IF(time_ms > 900, 'OK', time_ms) AS time_ms_low,
+IF(time_ms > 1500, 'OK', time_ms) AS time_ms_low,
 IF(time_ms < 1000000, 'OK', time_ms) AS time_ms_high
 FROM INFORMATION_SCHEMA.PROCESSLIST
 WHERE ID=@tid;

=== modified file 'mysql-test/t/information_schema.test'
--- a/mysql-test/t/information_schema.test	2009-09-23 11:03:47 +0000
+++ b/mysql-test/t/information_schema.test	2009-09-29 20:19:43 +0000
@@ -1105,13 +1105,13 @@ connect (pslistcon,localhost,root,,test)
 let $ID= `select connection_id()`;
 SELECT 'other connection here' AS who;
 connection default;
-sleep 1;
+sleep 2;
 --disable_query_log
 eval SET @tid=$ID;
 --enable_query_log
 SELECT IF(`time` > 0, 'OK', `time`) AS time_low,
        IF(`time` < 1000, 'OK', `time`) AS time_high,
-       IF(time_ms > 900, 'OK', time_ms) AS time_ms_low,
+       IF(time_ms > 1500, 'OK', time_ms) AS time_ms_low,
        IF(time_ms < 1000000, 'OK', time_ms) AS time_ms_high
   FROM INFORMATION_SCHEMA.PROCESSLIST
  WHERE ID=@tid;