summaryrefslogtreecommitdiff
path: root/mysql-test/suite/percona
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2010-08-06 10:46:51 +0300
committerMichael Widenius <monty@askmonty.org>2010-08-06 10:46:51 +0300
commit91831449227fd1a315ff8f7699e38c9a38f6b42a (patch)
tree37fcaf7a253d81c318a8168bded6ddad8096dfb2 /mysql-test/suite/percona
parent27d27deeebeeaff1a2d72365de6d7a44ca419156 (diff)
downloadmariadb-git-91831449227fd1a315ff8f7699e38c9a38f6b42a.tar.gz
Fixed timing issue in test suite
Diffstat (limited to 'mysql-test/suite/percona')
-rw-r--r--mysql-test/suite/percona/percona_slow_query_log-long_query_time-master.opt2
-rw-r--r--mysql-test/suite/percona/percona_slow_query_log-long_query_time.result19
-rw-r--r--mysql-test/suite/percona/percona_slow_query_log-long_query_time.test12
3 files changed, 15 insertions, 18 deletions
diff --git a/mysql-test/suite/percona/percona_slow_query_log-long_query_time-master.opt b/mysql-test/suite/percona/percona_slow_query_log-long_query_time-master.opt
index 473323e0bd9..5cbb82d1261 100644
--- a/mysql-test/suite/percona/percona_slow_query_log-long_query_time-master.opt
+++ b/mysql-test/suite/percona/percona_slow_query_log-long_query_time-master.opt
@@ -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
diff --git a/mysql-test/suite/percona/percona_slow_query_log-long_query_time.result b/mysql-test/suite/percona/percona_slow_query_log-long_query_time.result
index abc9c1d9994..03f8745ca62 100644
--- a/mysql-test/suite/percona/percona_slow_query_log-long_query_time.result
+++ b/mysql-test/suite/percona/percona_slow_query_log-long_query_time.result
@@ -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
diff --git a/mysql-test/suite/percona/percona_slow_query_log-long_query_time.test b/mysql-test/suite/percona/percona_slow_query_log-long_query_time.test
index 9c034a75fa8..55f3e61cd09 100644
--- a/mysql-test/suite/percona/percona_slow_query_log-long_query_time.test
+++ b/mysql-test/suite/percona/percona_slow_query_log-long_query_time.test
@@ -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;