Merge pull request percona#3613 from kamil-holubicki/PS-6150-post-pus…

…h-fix-5.7 Post push fix: PS-6150: MySQL crash - sync_mutex_to_string 5.7
inikep · Jan 17, 2020 · ed88692 · ed88692
2 parents f3fe668 + fc868a6
commit ed88692
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/mysql-test/suite/innodb/r/percona_extended_innodb_status.result b/mysql-test/suite/innodb/r/percona_extended_innodb_status.result
@@ -96,5 +96,5 @@ SET DEBUG_SYNC='now WAIT_FOR autoinc_mutex_wait.locked';
 SHOW ENGINE INNODB STATUS;
 SET DEBUG_SYNC='now SIGNAL autoinc_lock.continue';
 SET SESSION debug="-d,catch_autoinc_mutex_os_lock";
-SET DEBUG_SYNC = 'RESET';
 DROP TABLE t1;
+SET DEBUG_SYNC = 'RESET';
diff --git a/mysql-test/suite/innodb/t/percona_extended_innodb_status.test b/mysql-test/suite/innodb/t/percona_extended_innodb_status.test
@@ -1,5 +1,5 @@
 --source include/have_innodb.inc
-
+--source include/have_debug_sync.inc
 --source include/count_sessions.inc
 
 # saving global variables which will be changed in this test
@@ -103,7 +103,6 @@ SHOW ENGINE INNODB STATUS;
 --connection default
 SET DEBUG_SYNC='now SIGNAL autoinc_lock.continue';
 SET SESSION debug="-d,catch_autoinc_mutex_os_lock";
-SET DEBUG_SYNC = 'RESET';
 
 --connection con1
 --reap
@@ -119,4 +118,5 @@ DROP TABLE t1;
 
 # wait until all additional connections close
 --source include/wait_until_count_sessions.inc
+SET DEBUG_SYNC = 'RESET';