Merge with 5.1

4 files changed, 16 insertions, 19 deletions

diff --git a/mysql-test/suite/innodb_plugin/t/innodb-timeout.test b/mysql-test/suite/innodb_plugin/t/innodb-timeout.test
index 34eda7279b2..f6d319c7961 100644
--- a/mysql-test/suite/innodb_plugin/t/innodb-timeout.test
+++ b/mysql-test/suite/innodb_plugin/t/innodb-timeout.test
@@ -48,7 +48,7 @@ connection b;
 select * from t1 for update;
 
 connection a;
-sleep 2;
+sleep 3;
 commit;
 
 connection b;
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;