1 files changed, 5 insertions, 5 deletions
diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_again_allow.test b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_again_allow.test
index 14c92597f95..ae58f4089ed 100644
--- a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_again_allow.test
+++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_again_allow.test
@@ -15,9 +15,9 @@
 # Temporary failure in name resolution
 call mtr.add_suppression("santa.claus.ipv6.example.com");
 
-flush status;
-flush hosts;
-select @@global.debug;
+# Enforce a clean state
+--source ../include/wait_for_pfs_thread_count.inc
+--source ../include/hostcache_set_state.inc
 
 grant select on test.* to 'root'@'2001:db8::6:6';
 
@@ -27,7 +27,7 @@ select current_user();
 disconnect con1;
 
 --connection default
-set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_error_again";
+set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_error_again";
 
 connect (con2,"::1",root,,test,$MASTER_MYPORT,);
 select "Con2 is alive";
@@ -48,5 +48,5 @@ disconnect con3;
 revoke select on test.* from 'root'@'2001:db8::6:6';
 drop user 'root'@'2001:db8::6:6';
 
-set global debug= default;
+set global debug_dbug= default;