[Commits] bzr commit into MariaDB 5.1, with Maria 1.5:maria branch (monty:2890)

6 Aug 2010

#At lp:maria based on revid:monty@askmonty.org-20100806070229-mge2g09gs27ltitc

 2890 Michael Widenius	2010-08-06
      Fixed timing issue in test suite
      modified:
        mysql-test/suite/percona/percona_slow_query_log-long_query_time-master.opt
        mysql-test/suite/percona/percona_slow_query_log-long_query_time.result
        mysql-test/suite/percona/percona_slow_query_log-long_query_time.test

=== modified file 'mysql-test/suite/percona/percona_slow_query_log-long_query_time-master.opt'

--- a/mysql-test/suite/percona/percona_slow_query_log-long_query_time-master.opt	2010-08-03 10:54:05 +0000
+++ b/mysql-test/suite/percona/percona_slow_query_log-long_query_time-master.opt	2010-08-06 07:46:51 +0000
@@ -1 +1 @@
---slow-query-log-file=percona_slow_query_log-long_query_time.log --long-query-time=2
\ No newline at end of file
+--slow-query-log-file=percona_slow_query_log-long_query_time.log --long-query-time=3

=== modified file 'mysql-test/suite/percona/percona_slow_query_log-long_query_time.result'
--- a/mysql-test/suite/percona/percona_slow_query_log-long_query_time.result	2010-08-05 09:28:19 +0000
+++ b/mysql-test/suite/percona/percona_slow_query_log-long_query_time.result	2010-08-06 07:46:51 +0000
@@ -1,22 +1,21 @@
 SELECT sleep(1);
 sleep(1)
 0
-SELECT sleep(3);
-sleep(3)
+SELECT sleep(6);
+sleep(6)
 0
-SELECT sleep(5);
-sleep(5)
+SELECT sleep(10);
+sleep(10)
 0
-set long_query_time=4;
+set long_query_time=8;
 SELECT sleep(1);
 sleep(1)
 0
-SELECT sleep(3);
-sleep(3)
+SELECT sleep(6);
+sleep(6)
 0
-SELECT sleep(5);
-sleep(5)
+SELECT sleep(12);
+sleep(12)
 0
-set long_query_time=2;
 cat MYSQLD_DATADIR/percona_slow_query_log-long_query_time.log | grep -c Query_time
 3

=== modified file 'mysql-test/suite/percona/percona_slow_query_log-long_query_time.test'
--- a/mysql-test/suite/percona/percona_slow_query_log-long_query_time.test	2010-08-05 09:28:19 +0000
+++ b/mysql-test/suite/percona/percona_slow_query_log-long_query_time.test	2010-08-06 07:46:51 +0000
@@ -1,16 +1,14 @@
 source include/have_innodb.inc;
 
 SELECT sleep(1);
-SELECT sleep(3);
-SELECT sleep(5);
+SELECT sleep(6);
+SELECT sleep(10);
 
-set long_query_time=4;
+set long_query_time=8;
 
 SELECT sleep(1);
-SELECT sleep(3);
-SELECT sleep(5);
-
-set long_query_time=2;
+SELECT sleep(6);
+SELECT sleep(12);
 
 let $MYSQLD_DATADIR= `select @@datadir`;
 let $cmd = cat $MYSQLD_DATADIR/percona_slow_query_log-long_query_time.log | grep -c Query_time;

    