From 8334aced009e9748e17ce697191e00c9f14e78b9 Mon Sep 17 00:00:00 2001 From: Vladislav Vaintroub Date: Tue, 10 Apr 2018 16:17:15 +0100 Subject: MDEV-14380 Reduce possibility to timing-induced error in test Also, shorten the test so it usually runs 2 seconds, not 3. --- mysql-test/main/set_statement_notembedded.result | 4 ++-- mysql-test/main/set_statement_notembedded.test | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mysql-test/main/set_statement_notembedded.result b/mysql-test/main/set_statement_notembedded.result index 561c30d49ac..17cf2f63da9 100644 --- a/mysql-test/main/set_statement_notembedded.result +++ b/mysql-test/main/set_statement_notembedded.result @@ -1,13 +1,13 @@ SELECT @@MAX_STATEMENT_TIME; @@MAX_STATEMENT_TIME 0.000000 -SET STATEMENT MAX_STATEMENT_TIME=2 FOR SELECT SLEEP(1); +SET STATEMENT MAX_STATEMENT_TIME=3 FOR SELECT SLEEP(1); SLEEP(1) 0 SHOW STATUS LIKE "max_statement_time_exceeded"; Variable_name Value Max_statement_time_exceeded 0 -SET STATEMENT MAX_STATEMENT_TIME=2 FOR SELECT SLEEP(3); +SET STATEMENT MAX_STATEMENT_TIME=1 FOR SELECT SLEEP(3); SLEEP(3) 1 SHOW STATUS LIKE "max_statement_time_exceeded"; diff --git a/mysql-test/main/set_statement_notembedded.test b/mysql-test/main/set_statement_notembedded.test index 7bb8f5e1aab..16488846fba 100644 --- a/mysql-test/main/set_statement_notembedded.test +++ b/mysql-test/main/set_statement_notembedded.test @@ -4,9 +4,9 @@ # statement timeout # SELECT @@MAX_STATEMENT_TIME; -SET STATEMENT MAX_STATEMENT_TIME=2 FOR SELECT SLEEP(1); +SET STATEMENT MAX_STATEMENT_TIME=3 FOR SELECT SLEEP(1); SHOW STATUS LIKE "max_statement_time_exceeded"; -SET STATEMENT MAX_STATEMENT_TIME=2 FOR SELECT SLEEP(3); +SET STATEMENT MAX_STATEMENT_TIME=1 FOR SELECT SLEEP(3); SHOW STATUS LIKE "max_statement_time_exceeded"; SELECT @@MAX_STATEMENT_TIME; -- cgit v1.2.1