summaryrefslogtreecommitdiff
path: root/mysql-test/suite/perfschema/r/hostcache_ipv4_auth_plugin.result
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/r/hostcache_ipv4_auth_plugin.result
parent64952203af161c6e72744b6a2fb8e0f5274ea4d6 (diff)
parent259185764ba949bbe0cfa6bbef4673f61155cb90 (diff)
downloadmariadb-git-ded128aa9b3d40775e626a08a744a93d9ba71b01.tar.gz
Merge 10.4 into 10.5
Diffstat (limited to 'mysql-test/suite/perfschema/r/hostcache_ipv4_auth_plugin.result')
-rw-r--r--mysql-test/suite/perfschema/r/hostcache_ipv4_auth_plugin.result3
1 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_auth_plugin.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_auth_plugin.result
index 22dd7e7632c..1c34faa9457 100644
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_auth_plugin.result
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_auth_plugin.result
@@ -24,6 +24,7 @@ current_user()
root@localhost
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";
uninstall plugin test_plugin_server;
ERROR HY000: Plugin 'test_plugin_server' is not loaded
@@ -194,5 +195,5 @@ REVOKE PROXY ON 'plug_dest'@'santa.claus.ipv4.example.com'
FROM 'plug'@'santa.claus.ipv4.example.com';
DROP USER 'plug'@'santa.claus.ipv4.example.com';
DROP USER 'plug_dest'@'santa.claus.ipv4.example.com';
-set global debug_dbug= default;
+SET @@GLOBAL.debug_dbug = @saved_dbug;
delete from mysql.plugin where name='test_plugin_server';