summaryrefslogtreecommitdiff
path: root/mysql-test/suite/perfschema/t/hostcache_ipv4_passwd.test
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2020-01-20 16:48:56 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2020-01-20 16:48:56 +0200
commitded128aa9b3d40775e626a08a744a93d9ba71b01 (patch)
tree2abae3ef8fd5438fc99d269b47d645faec3cb8e8 /mysql-test/suite/perfschema/t/hostcache_ipv4_passwd.test
parent64952203af161c6e72744b6a2fb8e0f5274ea4d6 (diff)
parent259185764ba949bbe0cfa6bbef4673f61155cb90 (diff)
downloadmariadb-git-ded128aa9b3d40775e626a08a744a93d9ba71b01.tar.gz
Merge 10.4 into 10.5
Diffstat (limited to 'mysql-test/suite/perfschema/t/hostcache_ipv4_passwd.test')
-rw-r--r--mysql-test/suite/perfschema/t/hostcache_ipv4_passwd.test3
1 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv4_passwd.test b/mysql-test/suite/perfschema/t/hostcache_ipv4_passwd.test
index ea331647b48..c6ff89f0902 100644
--- a/mysql-test/suite/perfschema/t/hostcache_ipv4_passwd.test
+++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_passwd.test
@@ -29,6 +29,7 @@ select current_user();
disconnect con1;
--connection default
+SET @saved_dbug = @@GLOBAL.debug_dbug;
set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4";
--disable_query_log
@@ -82,5 +83,5 @@ connect (con2f,"127.0.0.1",user_with,wrong_password,test,$MASTER_MYPORT,);
drop user 'user_with'@'santa.claus.ipv4.example.com';
drop user 'user_without'@'santa.claus.ipv4.example.com';
-set global debug_dbug= default;
+SET @@GLOBAL.debug_dbug = @saved_dbug;