summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2017-05-10 17:10:28 +0200
committerSergei Golubchik <serg@mariadb.org>2017-05-10 18:11:03 +0200
commitfee8d39ecb1dd69b46895ba3feb2bcf17a0b17f2 (patch)
tree222b9813f950e00615dce54de599edbf2f6c43ae
parent2819133711bd31121dca0f827e860446fef33600 (diff)
downloadmariadb-git-fee8d39ecb1dd69b46895ba3feb2bcf17a0b17f2.tar.gz
MDEV-12754 innodb.truncate_debug fails in buildbot with embedded due to semaphore wait
fix sporadic innodb.truncate_purge_debug failures
-rw-r--r--mysql-test/suite/innodb/r/truncate_debug.result2
-rw-r--r--mysql-test/suite/innodb/r/truncate_purge_debug.result2
-rw-r--r--mysql-test/suite/innodb/t/truncate_debug.test2
-rw-r--r--mysql-test/suite/innodb/t/truncate_purge_debug.test2
4 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/suite/innodb/r/truncate_debug.result b/mysql-test/suite/innodb/r/truncate_debug.result
index 47316fed2f7..eb4e9cfbc85 100644
--- a/mysql-test/suite/innodb/r/truncate_debug.result
+++ b/mysql-test/suite/innodb/r/truncate_debug.result
@@ -75,12 +75,12 @@ connect con2,localhost,root,,;
set global innodb_adaptive_hash_index=off;
connection default;
SET DEBUG_SYNC= 'now SIGNAL finish_scan';
-SET DEBUG_SYNC= 'RESET';
connection con1;
disconnect con1;
connection con2;
disconnect con2;
connection default;
+SET DEBUG_SYNC= 'RESET';
SET session lock_wait_timeout=default;
set global innodb_adaptive_hash_index=on;
drop table t1,t2,t3;
diff --git a/mysql-test/suite/innodb/r/truncate_purge_debug.result b/mysql-test/suite/innodb/r/truncate_purge_debug.result
index edece3019bc..164987083d5 100644
--- a/mysql-test/suite/innodb/r/truncate_purge_debug.result
+++ b/mysql-test/suite/innodb/r/truncate_purge_debug.result
@@ -22,8 +22,8 @@ connection default;
InnoDB 0 transactions not purged
SET GLOBAL innodb_purge_rseg_truncate_frequency = @saved_frequency;
SET DEBUG_SYNC = 'now SIGNAL finish_scan';
-SET DEBUG_SYNC = 'RESET';
connection con1;
disconnect con1;
connection default;
+SET DEBUG_SYNC = 'RESET';
drop table t1;
diff --git a/mysql-test/suite/innodb/t/truncate_debug.test b/mysql-test/suite/innodb/t/truncate_debug.test
index fed5cf9392b..915688ed354 100644
--- a/mysql-test/suite/innodb/t/truncate_debug.test
+++ b/mysql-test/suite/innodb/t/truncate_debug.test
@@ -103,7 +103,6 @@ send set global innodb_adaptive_hash_index=off;
connection default;
SET DEBUG_SYNC= 'now SIGNAL finish_scan';
-SET DEBUG_SYNC= 'RESET';
connection con1;
reap;
@@ -114,6 +113,7 @@ reap;
disconnect con2;
connection default;
+SET DEBUG_SYNC= 'RESET';
SET session lock_wait_timeout=default;
set global innodb_adaptive_hash_index=on;
diff --git a/mysql-test/suite/innodb/t/truncate_purge_debug.test b/mysql-test/suite/innodb/t/truncate_purge_debug.test
index 70ebd28024d..513c59e12c8 100644
--- a/mysql-test/suite/innodb/t/truncate_purge_debug.test
+++ b/mysql-test/suite/innodb/t/truncate_purge_debug.test
@@ -55,12 +55,12 @@ echo $remaining transactions not purged;
SET GLOBAL innodb_purge_rseg_truncate_frequency = @saved_frequency;
SET DEBUG_SYNC = 'now SIGNAL finish_scan';
-SET DEBUG_SYNC = 'RESET';
connection con1;
reap;
disconnect con1;
connection default;
+SET DEBUG_SYNC = 'RESET';
drop table t1;
--source include/wait_until_count_sessions.inc