[Commits] ca2f2b7: Adjust test wait timeout.

Jan Lindström jan.lindstrom at mariadb.com
Tue Mar 31 09:54:55 EEST 2015


revision-id: ca2f2b71511df1dc256949329ea7e89d812f16bf
parent(s): 81113dae1747e2dd75ff95761d0853dd4387e814
committer: Jan Lindström
branch nick: 10.1
timestamp: 2015-03-31 09:54:40 +0300
message:

Adjust test wait timeout.

---
 mysql-test/suite/innodb/t/innodb_sys_semaphore_waits.test           | 4 ++--
 .../suite/sys_vars/r/innodb_fatal_semaphore_wait_threshold.result   | 2 +-
 .../suite/sys_vars/t/innodb_fatal_semaphore_wait_threshold.test     | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/mysql-test/suite/innodb/t/innodb_sys_semaphore_waits.test b/mysql-test/suite/innodb/t/innodb_sys_semaphore_waits.test
index eda798e..800199d 100644
--- a/mysql-test/suite/innodb/t/innodb_sys_semaphore_waits.test
+++ b/mysql-test/suite/innodb/t/innodb_sys_semaphore_waits.test
@@ -77,8 +77,8 @@ exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect;
 
 # It will take 20 seconds to detect the long semaphore and mysqld to abort.
 # This test will be treated as pass as long as mysqld crash/restart is dectected
-# in 60 seconds.
-let $counter= 60;
+# in 80 seconds.
+let $counter= 80;
 let $mysql_errno= 0;
 while (!$mysql_errno)
 {
diff --git a/mysql-test/suite/sys_vars/r/innodb_fatal_semaphore_wait_threshold.result b/mysql-test/suite/sys_vars/r/innodb_fatal_semaphore_wait_threshold.result
index 40ab0f4..a6da229 100644
--- a/mysql-test/suite/sys_vars/r/innodb_fatal_semaphore_wait_threshold.result
+++ b/mysql-test/suite/sys_vars/r/innodb_fatal_semaphore_wait_threshold.result
@@ -4,7 +4,7 @@ drop table if exists t1;
 # Switch to connection con1
 create table t1 (id integer, x integer) engine = InnoDB;
 insert into t1 values(0, 0);
-set @@debug_dbug="d,fatal-semaphore-timeout";
+set DEBUG_DBUG='+d,fatal-semaphore-timeout';
 set autocommit=0;
 # Sending query on con1,
 # the session will hold lock table mutex and sleep
diff --git a/mysql-test/suite/sys_vars/t/innodb_fatal_semaphore_wait_threshold.test b/mysql-test/suite/sys_vars/t/innodb_fatal_semaphore_wait_threshold.test
index 866c652..9493536 100644
--- a/mysql-test/suite/sys_vars/t/innodb_fatal_semaphore_wait_threshold.test
+++ b/mysql-test/suite/sys_vars/t/innodb_fatal_semaphore_wait_threshold.test
@@ -25,7 +25,7 @@ eval create table t1 (id integer, x integer) engine = InnoDB;
 insert into t1 values(0, 0);
 
 # Enable the debug injection.
-set @@debug_dbug="d,fatal-semaphore-timeout";
+set DEBUG_DBUG='+d,fatal-semaphore-timeout';
 set autocommit=0;
 
 # The following query will hang for an hour since the debug injection
@@ -82,8 +82,8 @@ exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect;
 
 # It will take 20 seconds to detect the long semaphore and mysqld to abort.
 # This test will be treated as pass as long as mysqld crash/restart is dectected
-# in 60 seconds.
-let $counter= 60;
+# in 80 seconds.
+let $counter= 80;
 let $mysql_errno= 0;
 while (!$mysql_errno)
 {


More information about the commits mailing list