diff options
| author | unknown <timour@askmonty.org> | 2013-07-03 12:19:03 +0300 |
|---|---|---|
| committer | unknown <timour@askmonty.org> | 2013-07-03 12:19:03 +0300 |
| commit | 5f0d489da8771d8ddcc440ecc811a190a421e486 (patch) | |
| tree | 22a4af06c737f39720e59d9bfac2388656163f9b /mysql-test/suite/perfschema | |
| parent | ecbf36a914b696b01ae1497567025e239f4ea693 (diff) | |
| download | mariadb-git-5f0d489da8771d8ddcc440ecc811a190a421e486.tar.gz | |
MDEV-4058
MySQL 5.6.10 performance schema: merge of the test files for the host_cache table
Diffstat (limited to 'mysql-test/suite/perfschema')
82 files changed, 206 insertions, 234 deletions
diff --git a/mysql-test/suite/perfschema/disabled.def b/mysql-test/suite/perfschema/disabled.def index a72014a652b..888298bbb09 100644 --- a/mysql-test/suite/perfschema/disabled.def +++ b/mysql-test/suite/perfschema/disabled.def @@ -9,41 +9,3 @@ # Do not use any TAB characters for whitespace. # ############################################################################## -ddl_host_cache: -dml_host_cache: -hostcache_ipv4_addrinfo_again_allow: -hostcache_ipv4_addrinfo_again_deny: -hostcache_ipv4_addrinfo_bad_allow: -hostcache_ipv4_addrinfo_bad_deny: -hostcache_ipv4_addrinfo_good_allow: -hostcache_ipv4_addrinfo_good_deny: -hostcache_ipv4_addrinfo_noname_allow: -hostcache_ipv4_addrinfo_noname_deny: -hostcache_ipv4_auth_plugin: -hostcache_ipv4_blocked: -hostcache_ipv4_format: -hostcache_ipv4_max_con: -hostcache_ipv4_nameinfo_again_allow: -hostcache_ipv4_nameinfo_again_deny: -hostcache_ipv4_nameinfo_noname_allow: -hostcache_ipv4_nameinfo_noname_deny: -hostcache_ipv4_passwd: -hostcache_ipv4_ssl: -hostcache_ipv6_addrinfo_again_allow: -hostcache_ipv6_addrinfo_again_deny: -hostcache_ipv6_addrinfo_bad_allow: -hostcache_ipv6_addrinfo_bad_deny: -hostcache_ipv6_addrinfo_good_allow: -hostcache_ipv6_addrinfo_good_deny: -hostcache_ipv6_addrinfo_noname_allow: -hostcache_ipv6_addrinfo_noname_deny: -hostcache_ipv6_auth_plugin: -hostcache_ipv6_blocked: -hostcache_ipv6_max_con: -hostcache_ipv6_nameinfo_again_allow: -hostcache_ipv6_nameinfo_again_deny: -hostcache_ipv6_nameinfo_noname_allow: -hostcache_ipv6_nameinfo_noname_deny: -hostcache_ipv6_passwd: -hostcache_ipv6_ssl: -hostcache_peer_addr: diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_allow.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_allow.result index d2e99912200..736d42faaca 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_allow.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_allow.result @@ -11,7 +11,7 @@ Con1 is alive select current_user(); current_user() root@localhost -set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_error_again"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_error_again"; select "Con2 is alive"; Con2 is alive Con2 is alive @@ -82,4 +82,4 @@ FIRST_ERROR_SEEN set LAST_ERROR_SEEN set revoke select on test.* from 'root'@'192.0.2.4'; drop user 'root'@'192.0.2.4'; -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_deny.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_deny.result index 39057797b76..44a57fce83c 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_deny.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_deny.result @@ -10,8 +10,8 @@ Con1 is alive select current_user(); current_user() root@localhost -set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_error_again"; -ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MySQL server +set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_error_again"; +ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MariaDB server "Dumping performance_schema.host_cache" IP 192.0.2.4 HOST NULL @@ -40,7 +40,7 @@ COUNT_LOCAL_ERRORS 0 COUNT_UNKNOWN_ERRORS 0 FIRST_ERROR_SEEN set LAST_ERROR_SEEN set -ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MySQL server +ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MariaDB server "Dumping performance_schema.host_cache" IP 192.0.2.4 HOST NULL @@ -69,4 +69,4 @@ COUNT_LOCAL_ERRORS 0 COUNT_UNKNOWN_ERRORS 0 FIRST_ERROR_SEEN set LAST_ERROR_SEEN set -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_allow.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_allow.result index 7bddddb44a2..26edead868b 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_allow.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_allow.result @@ -11,7 +11,7 @@ Con1 is alive select current_user(); current_user() root@localhost -set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_bad_ipv4"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_bad_ipv4"; select "Con2 is alive"; Con2 is alive Con2 is alive @@ -82,4 +82,4 @@ FIRST_ERROR_SEEN set LAST_ERROR_SEEN set revoke select on test.* from 'root'@'192.0.2.4'; drop user 'root'@'192.0.2.4'; -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_deny.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_deny.result index 4bb67d51eb7..f231dbfa488 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_deny.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_deny.result @@ -10,8 +10,8 @@ Con1 is alive select current_user(); current_user() root@localhost -set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_bad_ipv4"; -ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MySQL server +set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_bad_ipv4"; +ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MariaDB server "Dumping performance_schema.host_cache" IP 192.0.2.4 HOST NULL @@ -40,7 +40,7 @@ COUNT_LOCAL_ERRORS 0 COUNT_UNKNOWN_ERRORS 0 FIRST_ERROR_SEEN set LAST_ERROR_SEEN set -ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MySQL server +ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MariaDB server "Dumping performance_schema.host_cache" IP 192.0.2.4 HOST NULL @@ -69,4 +69,4 @@ COUNT_LOCAL_ERRORS 0 COUNT_UNKNOWN_ERRORS 0 FIRST_ERROR_SEEN set LAST_ERROR_SEEN set -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_allow.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_allow.result index dd69ff95ccd..e3376e1f590 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_allow.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_allow.result @@ -11,7 +11,7 @@ Con1 is alive select current_user(); current_user() root@localhost -set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4"; select "Con2 is alive"; Con2 is alive Con2 is alive @@ -82,4 +82,4 @@ FIRST_ERROR_SEEN null LAST_ERROR_SEEN null revoke select on test.* from 'root'@'santa.claus.ipv4.example.com'; drop user 'root'@'santa.claus.ipv4.example.com'; -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_deny.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_deny.result index 1443c9708a6..9550a4e2e75 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_deny.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_deny.result @@ -10,8 +10,8 @@ Con1 is alive select current_user(); current_user() root@localhost -set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4"; -ERROR HY000: Host 'santa.claus.ipv4.example.com' is not allowed to connect to this MySQL server +set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4"; +ERROR HY000: Host 'santa.claus.ipv4.example.com' is not allowed to connect to this MariaDB server "Dumping performance_schema.host_cache" IP 192.0.2.4 HOST santa.claus.ipv4.example.com @@ -40,7 +40,7 @@ COUNT_LOCAL_ERRORS 0 COUNT_UNKNOWN_ERRORS 0 FIRST_ERROR_SEEN set LAST_ERROR_SEEN set -ERROR HY000: Host 'santa.claus.ipv4.example.com' is not allowed to connect to this MySQL server +ERROR HY000: Host 'santa.claus.ipv4.example.com' is not allowed to connect to this MariaDB server "Dumping performance_schema.host_cache" IP 192.0.2.4 HOST santa.claus.ipv4.example.com @@ -69,4 +69,4 @@ COUNT_LOCAL_ERRORS 0 COUNT_UNKNOWN_ERRORS 0 FIRST_ERROR_SEEN set LAST_ERROR_SEEN set -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_allow.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_allow.result index a67937e32b2..6f6bf6f6551 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_allow.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_allow.result @@ -12,7 +12,7 @@ Con1 is alive select current_user(); current_user() root@localhost -set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_error_noname"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_error_noname"; select "Con2 is alive"; Con2 is alive Con2 is alive @@ -85,4 +85,4 @@ revoke select on test.* from 'root'@'santa.claus.ipv4.example.com'; revoke select on test.* from 'root'@'192.0.2.4'; drop user 'root'@'santa.claus.ipv4.example.com'; drop user 'root'@'192.0.2.4'; -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_deny.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_deny.result index 0ec0b833d0e..c84148506d6 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_deny.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_deny.result @@ -10,8 +10,8 @@ Con1 is alive select current_user(); current_user() root@localhost -set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_error_noname"; -ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MySQL server +set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_error_noname"; +ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MariaDB server "Dumping performance_schema.host_cache" IP 192.0.2.4 HOST NULL @@ -40,7 +40,7 @@ COUNT_LOCAL_ERRORS 0 COUNT_UNKNOWN_ERRORS 0 FIRST_ERROR_SEEN set LAST_ERROR_SEEN set -ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MySQL server +ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MariaDB server "Dumping performance_schema.host_cache" IP 192.0.2.4 HOST NULL @@ -69,4 +69,4 @@ COUNT_LOCAL_ERRORS 0 COUNT_UNKNOWN_ERRORS 0 FIRST_ERROR_SEEN set LAST_ERROR_SEEN set -set global debug= default; +set global debug_dbug= default; 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 4e1cbacf228..b8382581be5 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv4_auth_plugin.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_auth_plugin.result @@ -14,7 +14,7 @@ Con1 is alive select current_user(); current_user() root@localhost -set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4"; +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 "Dumping performance_schema.host_cache" @@ -177,4 +177,4 @@ 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= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_blocked.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_blocked.result index 8e378e52bf5..158875d56de 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv4_blocked.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_blocked.result @@ -16,7 +16,7 @@ Con1 is alive select current_user(); current_user() root@localhost -set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4,native_password_bad_reply"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4,native_password_bad_reply"; ERROR 28000: Access denied for user 'quota'@'santa.claus.ipv4.example.com' (using password: NO) "Dumping performance_schema.host_cache" IP 192.0.2.4 @@ -195,4 +195,4 @@ LAST_ERROR_SEEN set revoke select on test.* from 'root'@'santa.claus.ipv4.example.com'; drop user 'root'@'santa.claus.ipv4.example.com'; set global max_connect_errors = @saved_max_connect_errors; -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_format.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_format.result index 5389dd43d11..62e0bc35dd7 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv4_format.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_format.result @@ -10,8 +10,8 @@ Con1 is alive select current_user(); current_user() root@localhost -set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_format_ipv4"; -ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MySQL server +set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_format_ipv4"; +ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MariaDB server "Dumping performance_schema.host_cache" IP 192.0.2.4 HOST NULL @@ -40,7 +40,7 @@ COUNT_LOCAL_ERRORS 0 COUNT_UNKNOWN_ERRORS 0 FIRST_ERROR_SEEN set LAST_ERROR_SEEN set -ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MySQL server +ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MariaDB server "Dumping performance_schema.host_cache" IP 192.0.2.4 HOST NULL @@ -69,4 +69,4 @@ COUNT_LOCAL_ERRORS 0 COUNT_UNKNOWN_ERRORS 0 FIRST_ERROR_SEEN set LAST_ERROR_SEEN set -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_max_con.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_max_con.result index 069fac2ddb8..94bc660727a 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv4_max_con.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_max_con.result @@ -6,7 +6,8 @@ select @@global.debug; select @@global.max_user_connections; @@global.max_user_connections -0 +1024 +select @@global.max_user_connections into @saved_max_user_connections; select @@global.max_connections; @@global.max_connections 151 @@ -21,7 +22,7 @@ Con1 is alive select current_user(); current_user() root@localhost -set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4"; select "Con2a is alive"; Con2a is alive Con2a is alive @@ -641,5 +642,6 @@ COUNT_UNKNOWN_ERRORS 0 FIRST_ERROR_SEEN set LAST_ERROR_SEEN set set global max_connections = @saved_max_connections; +set global max_user_connections = @saved_max_user_connections; drop user 'quota'@'santa.claus.ipv4.example.com'; -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_allow.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_allow.result index c2163a2d5b1..a250fd62d9b 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_allow.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_allow.result @@ -12,7 +12,7 @@ Con1 is alive select current_user(); current_user() root@localhost -set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_error_again"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_error_again"; select "Con2 is alive"; Con2 is alive Con2 is alive @@ -81,7 +81,7 @@ COUNT_LOCAL_ERRORS 0 COUNT_UNKNOWN_ERRORS 0 FIRST_ERROR_SEEN set LAST_ERROR_SEEN set -set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4"; select "Con4 is alive"; Con4 is alive Con4 is alive @@ -154,4 +154,4 @@ revoke select on test.* from 'root'@'192.0.2.4'; revoke select on test.* from 'root'@'santa.claus.ipv4.example.com'; drop user 'root'@'192.0.2.4'; drop user 'root'@'santa.claus.ipv4.example.com'; -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_deny.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_deny.result index 048081756bb..0c6db1015b0 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_deny.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_deny.result @@ -10,8 +10,8 @@ Con1 is alive select current_user(); current_user() root@localhost -set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_error_again"; -ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MySQL server +set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_error_again"; +ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MariaDB server "Dumping performance_schema.host_cache" IP 192.0.2.4 HOST NULL @@ -40,7 +40,7 @@ COUNT_LOCAL_ERRORS 0 COUNT_UNKNOWN_ERRORS 0 FIRST_ERROR_SEEN set LAST_ERROR_SEEN set -ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MySQL server +ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MariaDB server "Dumping performance_schema.host_cache" IP 192.0.2.4 HOST NULL @@ -69,8 +69,8 @@ COUNT_LOCAL_ERRORS 0 COUNT_UNKNOWN_ERRORS 0 FIRST_ERROR_SEEN set LAST_ERROR_SEEN set -set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4"; -ERROR HY000: Host 'santa.claus.ipv4.example.com' is not allowed to connect to this MySQL server +set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4"; +ERROR HY000: Host 'santa.claus.ipv4.example.com' is not allowed to connect to this MariaDB server "Dumping performance_schema.host_cache" IP 192.0.2.4 HOST santa.claus.ipv4.example.com @@ -99,7 +99,7 @@ COUNT_LOCAL_ERRORS 0 COUNT_UNKNOWN_ERRORS 0 FIRST_ERROR_SEEN set LAST_ERROR_SEEN set -ERROR HY000: Host 'santa.claus.ipv4.example.com' is not allowed to connect to this MySQL server +ERROR HY000: Host 'santa.claus.ipv4.example.com' is not allowed to connect to this MariaDB server "Dumping performance_schema.host_cache" IP 192.0.2.4 HOST santa.claus.ipv4.example.com @@ -128,4 +128,4 @@ COUNT_LOCAL_ERRORS 0 COUNT_UNKNOWN_ERRORS 0 FIRST_ERROR_SEEN set LAST_ERROR_SEEN set -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_allow.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_allow.result index 85a825f3907..d35f471931f 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_allow.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_allow.result @@ -11,7 +11,7 @@ Con1 is alive select current_user(); current_user() root@localhost -set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_error_noname"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_error_noname"; select "Con2 is alive"; Con2 is alive Con2 is alive @@ -82,4 +82,4 @@ FIRST_ERROR_SEEN set LAST_ERROR_SEEN set revoke select on test.* from 'root'@'192.0.2.4'; drop user 'root'@'192.0.2.4'; -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_deny.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_deny.result index 6bb381888f9..3e7c25e77a0 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_deny.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_deny.result @@ -10,8 +10,8 @@ Con1 is alive select current_user(); current_user() root@localhost -set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_error_noname"; -ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MySQL server +set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_error_noname"; +ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MariaDB server "Dumping performance_schema.host_cache" IP 192.0.2.4 HOST NULL @@ -40,7 +40,7 @@ COUNT_LOCAL_ERRORS 0 COUNT_UNKNOWN_ERRORS 0 FIRST_ERROR_SEEN set LAST_ERROR_SEEN set -ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MySQL server +ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MariaDB server "Dumping performance_schema.host_cache" IP 192.0.2.4 HOST NULL @@ -69,4 +69,4 @@ COUNT_LOCAL_ERRORS 0 COUNT_UNKNOWN_ERRORS 0 FIRST_ERROR_SEEN set LAST_ERROR_SEEN set -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_passwd.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_passwd.result index a7d34ede333..ced889c363b 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv4_passwd.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_passwd.result @@ -15,7 +15,7 @@ Con1 is alive select current_user(); current_user() root@localhost -set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4"; ERROR 28000: Access denied for user 'user_without'@'santa.claus.ipv4.example.com' (using password: YES) "Dumping performance_schema.host_cache" IP 192.0.2.4 @@ -192,4 +192,4 @@ FIRST_ERROR_SEEN set LAST_ERROR_SEEN set drop user 'user_with'@'santa.claus.ipv4.example.com'; drop user 'user_without'@'santa.claus.ipv4.example.com'; -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_ssl.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_ssl.result index e6e5b99392f..3ee017b1f31 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv4_ssl.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_ssl.result @@ -19,7 +19,7 @@ Con1 is alive select current_user(); current_user() root@localhost -set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4"; ERROR 28000: Access denied for user 'user_ssl'@'santa.claus.ipv4.example.com' (using password: NO) "Dumping performance_schema.host_cache" IP 192.0.2.4 @@ -138,4 +138,4 @@ FIRST_ERROR_SEEN set LAST_ERROR_SEEN set drop user 'user_ssl'@'santa.claus.ipv4.example.com'; drop user 'user_ssl_x509'@'santa.claus.ipv4.example.com'; -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_allow.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_allow.result index 599fcfe9130..6d16af7fa7d 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_allow.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_allow.result @@ -11,7 +11,7 @@ Con1 is alive select current_user(); current_user() root@localhost -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"; select "Con2 is alive"; Con2 is alive Con2 is alive @@ -82,4 +82,4 @@ FIRST_ERROR_SEEN set LAST_ERROR_SEEN set 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; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_deny.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_deny.result index d6b579fcb57..e0f421dacaa 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_deny.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_deny.result @@ -10,8 +10,8 @@ Con1 is alive select current_user(); current_user() root@localhost -set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_error_again"; -ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MySQL server +set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_error_again"; +ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MariaDB server "Dumping performance_schema.host_cache" IP 2001:db8::6:6 HOST NULL @@ -40,7 +40,7 @@ COUNT_LOCAL_ERRORS 0 COUNT_UNKNOWN_ERRORS 0 FIRST_ERROR_SEEN set LAST_ERROR_SEEN set -ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MySQL server +ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MariaDB server "Dumping performance_schema.host_cache" IP 2001:db8::6:6 HOST NULL @@ -69,4 +69,4 @@ COUNT_LOCAL_ERRORS 0 COUNT_UNKNOWN_ERRORS 0 FIRST_ERROR_SEEN set LAST_ERROR_SEEN set -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_allow.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_allow.result index 2a41f269159..b464442848a 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_allow.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_allow.result @@ -11,7 +11,7 @@ Con1 is alive select current_user(); current_user() root@localhost -set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_bad_ipv6"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_bad_ipv6"; select "Con2 is alive"; Con2 is alive Con2 is alive @@ -82,4 +82,4 @@ FIRST_ERROR_SEEN set LAST_ERROR_SEEN set 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; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_deny.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_deny.result index 786936acc20..1f8c5949342 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_deny.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_deny.result @@ -10,8 +10,8 @@ Con1 is alive select current_user(); current_user() root@localhost -set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_bad_ipv6"; -ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MySQL server +set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_bad_ipv6"; +ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MariaDB server "Dumping performance_schema.host_cache" IP 2001:db8::6:6 HOST NULL @@ -40,7 +40,7 @@ COUNT_LOCAL_ERRORS 0 COUNT_UNKNOWN_ERRORS 0 FIRST_ERROR_SEEN set LAST_ERROR_SEEN set -ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MySQL server +ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MariaDB server "Dumping performance_schema.host_cache" IP 2001:db8::6:6 HOST NULL @@ -69,4 +69,4 @@ COUNT_LOCAL_ERRORS 0 COUNT_UNKNOWN_ERRORS 0 FIRST_ERROR_SEEN set LAST_ERROR_SEEN set -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_allow.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_allow.result index b0269234e11..f29227577a0 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_allow.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_allow.result @@ -11,7 +11,7 @@ Con1 is alive select current_user(); current_user() root@localhost -set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6"; select "Con2 is alive"; Con2 is alive Con2 is alive @@ -82,4 +82,4 @@ FIRST_ERROR_SEEN null LAST_ERROR_SEEN null revoke select on test.* from 'root'@'santa.claus.ipv6.example.com'; drop user 'root'@'santa.claus.ipv6.example.com'; -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_deny.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_deny.result index 9bef9efb93c..3932aa6d47d 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_deny.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_deny.result @@ -9,8 +9,8 @@ Con1 is alive select current_user(); current_user() root@localhost -set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6"; -ERROR HY000: Host 'santa.claus.ipv6.example.com' is not allowed to connect to this MySQL server +set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6"; +ERROR HY000: Host 'santa.claus.ipv6.example.com' is not allowed to connect to this MariaDB server "Dumping performance_schema.host_cache" IP 2001:db8::6:6 HOST santa.claus.ipv6.example.com @@ -39,7 +39,7 @@ COUNT_LOCAL_ERRORS 0 COUNT_UNKNOWN_ERRORS 0 FIRST_ERROR_SEEN set LAST_ERROR_SEEN set -ERROR HY000: Host 'santa.claus.ipv6.example.com' is not allowed to connect to this MySQL server +ERROR HY000: Host 'santa.claus.ipv6.example.com' is not allowed to connect to this MariaDB server "Dumping performance_schema.host_cache" IP 2001:db8::6:6 HOST santa.claus.ipv6.example.com @@ -68,4 +68,4 @@ COUNT_LOCAL_ERRORS 0 COUNT_UNKNOWN_ERRORS 0 FIRST_ERROR_SEEN set LAST_ERROR_SEEN set -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_allow.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_allow.result index 432a0b4eaaf..fcba40f431e 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_allow.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_allow.result @@ -12,7 +12,7 @@ Con1 is alive select current_user(); current_user() root@localhost -set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_error_noname"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_error_noname"; select "Con2 is alive"; Con2 is alive Con2 is alive @@ -85,4 +85,4 @@ revoke select on test.* from 'root'@'santa.claus.ipv6.example.com'; revoke select on test.* from 'root'@'2001:db8::6:6'; drop user 'root'@'santa.claus.ipv6.example.com'; drop user 'root'@'2001:db8::6:6'; -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_deny.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_deny.result index ea5c6e357ef..225b22e58d3 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_deny.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_deny.result @@ -10,8 +10,8 @@ Con1 is alive select current_user(); current_user() root@localhost -set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_error_noname"; -ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MySQL server +set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_error_noname"; +ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MariaDB server "Dumping performance_schema.host_cache" IP 2001:db8::6:6 HOST NULL @@ -40,7 +40,7 @@ COUNT_LOCAL_ERRORS 0 COUNT_UNKNOWN_ERRORS 0 FIRST_ERROR_SEEN set LAST_ERROR_SEEN set -ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MySQL server +ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MariaDB server "Dumping performance_schema.host_cache" IP 2001:db8::6:6 HOST NULL @@ -69,4 +69,4 @@ COUNT_LOCAL_ERRORS 0 COUNT_UNKNOWN_ERRORS 0 FIRST_ERROR_SEEN set LAST_ERROR_SEEN set -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_auth_plugin.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_auth_plugin.result index 61fd1573067..b51d3e236bf 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv6_auth_plugin.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_auth_plugin.result @@ -14,7 +14,7 @@ Con1 is alive select current_user(); current_user() root@localhost -set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6"; uninstall plugin test_plugin_server; ERROR HY000: Plugin 'test_plugin_server' is not loaded "Dumping performance_schema.host_cache" @@ -177,4 +177,4 @@ REVOKE PROXY ON 'plug_dest'@'santa.claus.ipv6.example.com' FROM 'plug'@'santa.claus.ipv6.example.com'; DROP USER 'plug'@'santa.claus.ipv6.example.com'; DROP USER 'plug_dest'@'santa.claus.ipv6.example.com'; -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_blocked.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_blocked.result index 07121b6031f..973297578bc 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv6_blocked.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_blocked.result @@ -6,7 +6,7 @@ select @@global.debug; select @@global.max_connect_errors; @@global.max_connect_errors -10 +100 select @@global.max_connect_errors into @saved_max_connect_errors; set global max_connect_errors = 2; grant select on test.* to 'root'@'santa.claus.ipv6.example.com'; @@ -16,7 +16,7 @@ Con1 is alive select current_user(); current_user() root@localhost -set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6,native_password_bad_reply"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6,native_password_bad_reply"; ERROR 28000: Access denied for user 'quota'@'santa.claus.ipv6.example.com' (using password: NO) "Dumping performance_schema.host_cache" IP 2001:db8::6:6 @@ -195,4 +195,4 @@ LAST_ERROR_SEEN set revoke select on test.* from 'root'@'santa.claus.ipv6.example.com'; drop user 'root'@'santa.claus.ipv6.example.com'; set global max_connect_errors = @saved_max_connect_errors; -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_max_con.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_max_con.result index 3bf09f19843..c76c9cc2d05 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv6_max_con.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_max_con.result @@ -6,7 +6,8 @@ select @@global.debug; select @@global.max_user_connections; @@global.max_user_connections -0 +1024 +select @@global.max_user_connections into @saved_max_user_connections; select @@global.max_connections; @@global.max_connections 151 @@ -21,7 +22,7 @@ Con1 is alive select current_user(); current_user() root@localhost -set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6"; select "Con2a is alive"; Con2a is alive Con2a is alive @@ -641,5 +642,6 @@ COUNT_UNKNOWN_ERRORS 0 FIRST_ERROR_SEEN set LAST_ERROR_SEEN set set global max_connections = @saved_max_connections; +set global max_user_connections = @saved_max_user_connections; drop user 'quota'@'santa.claus.ipv6.example.com'; -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_allow.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_allow.result index 755f5b2037d..380b5110364 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_allow.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_allow.result @@ -12,7 +12,7 @@ Con1 is alive select current_user(); current_user() root@localhost -set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_error_again"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_error_again"; select "Con2 is alive"; Con2 is alive Con2 is alive @@ -81,7 +81,7 @@ COUNT_LOCAL_ERRORS 0 COUNT_UNKNOWN_ERRORS 0 FIRST_ERROR_SEEN set LAST_ERROR_SEEN set -set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6"; select "Con4 is alive"; Con4 is alive Con4 is alive @@ -154,4 +154,4 @@ revoke select on test.* from 'root'@'2001:db8::6:6'; revoke select on test.* from 'root'@'santa.claus.ipv6.example.com'; drop user 'root'@'2001:db8::6:6'; drop user 'root'@'santa.claus.ipv6.example.com'; -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_deny.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_deny.result index da240b24ca6..95897a490aa 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_deny.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_deny.result @@ -10,8 +10,8 @@ Con1 is alive select current_user(); current_user() root@localhost -set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_error_again"; -ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MySQL server +set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_error_again"; +ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MariaDB server "Dumping performance_schema.host_cache" IP 2001:db8::6:6 HOST NULL @@ -40,7 +40,7 @@ COUNT_LOCAL_ERRORS 0 COUNT_UNKNOWN_ERRORS 0 FIRST_ERROR_SEEN set LAST_ERROR_SEEN set -ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MySQL server +ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MariaDB server "Dumping performance_schema.host_cache" IP 2001:db8::6:6 HOST NULL @@ -69,8 +69,8 @@ COUNT_LOCAL_ERRORS 0 COUNT_UNKNOWN_ERRORS 0 FIRST_ERROR_SEEN set LAST_ERROR_SEEN set -set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6"; -ERROR HY000: Host 'santa.claus.ipv6.example.com' is not allowed to connect to this MySQL server +set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6"; +ERROR HY000: Host 'santa.claus.ipv6.example.com' is not allowed to connect to this MariaDB server "Dumping performance_schema.host_cache" IP 2001:db8::6:6 HOST santa.claus.ipv6.example.com @@ -99,7 +99,7 @@ COUNT_LOCAL_ERRORS 0 COUNT_UNKNOWN_ERRORS 0 FIRST_ERROR_SEEN set LAST_ERROR_SEEN set -ERROR HY000: Host 'santa.claus.ipv6.example.com' is not allowed to connect to this MySQL server +ERROR HY000: Host 'santa.claus.ipv6.example.com' is not allowed to connect to this MariaDB server "Dumping performance_schema.host_cache" IP 2001:db8::6:6 HOST santa.claus.ipv6.example.com @@ -128,4 +128,4 @@ COUNT_LOCAL_ERRORS 0 COUNT_UNKNOWN_ERRORS 0 FIRST_ERROR_SEEN set LAST_ERROR_SEEN set -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_allow.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_allow.result index 8a4dee22aa2..112073063f3 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_allow.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_allow.result @@ -11,7 +11,7 @@ Con1 is alive select current_user(); current_user() root@localhost -set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_error_noname"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_error_noname"; select "Con2 is alive"; Con2 is alive Con2 is alive @@ -82,4 +82,4 @@ FIRST_ERROR_SEEN set LAST_ERROR_SEEN set 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; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_deny.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_deny.result index 63b8a33b8bf..412e8c2dab2 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_deny.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_deny.result @@ -10,8 +10,8 @@ Con1 is alive select current_user(); current_user() root@localhost -set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_error_noname"; -ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MySQL server +set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_error_noname"; +ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MariaDB server "Dumping performance_schema.host_cache" IP 2001:db8::6:6 HOST NULL @@ -40,7 +40,7 @@ COUNT_LOCAL_ERRORS 0 COUNT_UNKNOWN_ERRORS 0 FIRST_ERROR_SEEN set LAST_ERROR_SEEN set -ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MySQL server +ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MariaDB server "Dumping performance_schema.host_cache" IP 2001:db8::6:6 HOST NULL @@ -69,4 +69,4 @@ COUNT_LOCAL_ERRORS 0 COUNT_UNKNOWN_ERRORS 0 FIRST_ERROR_SEEN set LAST_ERROR_SEEN set -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_passwd.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_passwd.result index 5d67dc8d943..d182d4eb5af 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv6_passwd.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_passwd.result @@ -15,7 +15,7 @@ Con1 is alive select current_user(); current_user() root@localhost -set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6"; ERROR 28000: Access denied for user 'user_without'@'santa.claus.ipv6.example.com' (using password: YES) "Dumping performance_schema.host_cache" IP 2001:db8::6:6 @@ -192,4 +192,4 @@ FIRST_ERROR_SEEN set LAST_ERROR_SEEN set drop user 'user_with'@'santa.claus.ipv6.example.com'; drop user 'user_without'@'santa.claus.ipv6.example.com'; -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_ssl.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_ssl.result index 29c151d24c1..9d7d60c0008 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv6_ssl.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_ssl.result @@ -19,7 +19,7 @@ Con1 is alive select current_user(); current_user() root@localhost -set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6"; ERROR 28000: Access denied for user 'user_ssl'@'santa.claus.ipv6.example.com' (using password: NO) "Dumping performance_schema.host_cache" IP 2001:db8::6:6 @@ -138,4 +138,4 @@ FIRST_ERROR_SEEN set LAST_ERROR_SEEN set drop user 'user_ssl'@'santa.claus.ipv6.example.com'; drop user 'user_ssl_x509'@'santa.claus.ipv6.example.com'; -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/r/hostcache_peer_addr.result b/mysql-test/suite/perfschema/r/hostcache_peer_addr.result index 0eff14b50f0..46c8489eea0 100644 --- a/mysql-test/suite/perfschema/r/hostcache_peer_addr.result +++ b/mysql-test/suite/perfschema/r/hostcache_peer_addr.result @@ -17,7 +17,7 @@ Con1 is alive select current_user(); current_user() root@localhost -set global debug= "+d,vio_peer_addr_error"; +set global debug_dbug= "+d,vio_peer_addr_error"; ERROR HY000: Can't get hostname for your address show global status like "connection_errors_%"; Variable_name Value @@ -38,7 +38,7 @@ Connection_errors_peer_address 2 Connection_errors_select 0 Connection_errors_tcpwrap 0 "Dumping performance_schema.host_cache" -set global debug= default; +set global debug_dbug= default; flush status; show global status like "connection_errors_%"; Variable_name Value diff --git a/mysql-test/suite/perfschema/r/socket_summary_by_instance_func_win.result b/mysql-test/suite/perfschema/r/socket_summary_by_instance_func_win.result index 2bdc2524bbc..2c5a9e9284f 100644 --- a/mysql-test/suite/perfschema/r/socket_summary_by_instance_func_win.result +++ b/mysql-test/suite/perfschema/r/socket_summary_by_instance_func_win.result @@ -59,7 +59,7 @@ ERROR 42S02: Table 'mysqltest.does_not_exist' doesn't exist # The statement has the same length like in 3.2 but the error # message is now different and much longer. SELECT col2 FROM does_not_exist WHERE col1 A 0; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'A 0' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'A 0' at line 1 # 3.4 SELECT ending with server sending an error message. # Statement and error message are a bit longer than in 3.1 # because the table name is longer. diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_again_allow.test b/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_again_allow.test index 4113618b0cf..d66351abfe9 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_again_allow.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_again_allow.test @@ -26,7 +26,7 @@ select current_user(); disconnect con1; --connection default -set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_error_again"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_error_again"; connect (con2,"127.0.0.1",root,,test,$MASTER_MYPORT,); select "Con2 is alive"; @@ -47,5 +47,5 @@ disconnect con3; revoke select on test.* from 'root'@'192.0.2.4'; drop user 'root'@'192.0.2.4'; -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_again_deny.test b/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_again_deny.test index 0c3bc365ae1..2e9fe463638 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_again_deny.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_again_deny.test @@ -24,7 +24,7 @@ select current_user(); disconnect con1; --connection default -set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_error_again"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_error_again"; --disable_query_log --error ER_HOST_NOT_PRIVILEGED @@ -42,5 +42,5 @@ connect (con3,"127.0.0.1",root,,test,$MASTER_MYPORT,); --connection default --source ../include/hostcache_dump.inc -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_bad_allow.test b/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_bad_allow.test index 6de091eae67..67df450b947 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_bad_allow.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_bad_allow.test @@ -28,7 +28,7 @@ select current_user(); disconnect con1; --connection default -set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_bad_ipv4"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_bad_ipv4"; connect (con2,"127.0.0.1",root,,test,$MASTER_MYPORT,); select "Con2 is alive"; @@ -49,5 +49,5 @@ disconnect con3; revoke select on test.* from 'root'@'192.0.2.4'; drop user 'root'@'192.0.2.4'; -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_bad_deny.test b/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_bad_deny.test index c5a9f33177d..eb0a366c07f 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_bad_deny.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_bad_deny.test @@ -26,7 +26,7 @@ select current_user(); disconnect con1; --connection default -set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_bad_ipv4"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_bad_ipv4"; --disable_query_log --error ER_HOST_NOT_PRIVILEGED @@ -44,5 +44,5 @@ connect (con3,"127.0.0.1",root,,test,$MASTER_MYPORT,); --connection default --source ../include/hostcache_dump.inc -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_good_allow.test b/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_good_allow.test index e479944183b..8aed2681a68 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_good_allow.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_good_allow.test @@ -26,7 +26,7 @@ select current_user(); disconnect con1; --connection default -set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4"; connect (con2,"127.0.0.1",root,,test,$MASTER_MYPORT,); select "Con2 is alive"; @@ -47,5 +47,5 @@ disconnect con3; revoke select on test.* from 'root'@'santa.claus.ipv4.example.com'; drop user 'root'@'santa.claus.ipv4.example.com'; -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_good_deny.test b/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_good_deny.test index cf31acf1da2..b8779cc7902 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_good_deny.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_good_deny.test @@ -24,7 +24,7 @@ select current_user(); disconnect con1; --connection default -set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4"; --disable_query_log --error ER_HOST_NOT_PRIVILEGED @@ -42,5 +42,5 @@ connect (con3,"127.0.0.1",root,,test,$MASTER_MYPORT,); --connection default --source ../include/hostcache_dump.inc -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_noname_allow.test b/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_noname_allow.test index 4932dd0a924..11c2d521e54 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_noname_allow.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_noname_allow.test @@ -27,7 +27,7 @@ select current_user(); disconnect con1; --connection default -set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_error_noname"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_error_noname"; connect (con2,"127.0.0.1",root,,test,$MASTER_MYPORT,); select "Con2 is alive"; @@ -50,5 +50,5 @@ revoke select on test.* from 'root'@'192.0.2.4'; drop user 'root'@'santa.claus.ipv4.example.com'; drop user 'root'@'192.0.2.4'; -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_noname_deny.test b/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_noname_deny.test index 0c10c53d933..1505288c8aa 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_noname_deny.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_noname_deny.test @@ -24,7 +24,7 @@ select current_user(); disconnect con1; --connection default -set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_error_noname"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_error_noname"; --disable_query_log --error ER_HOST_NOT_PRIVILEGED @@ -42,5 +42,5 @@ connect (con3,"127.0.0.1",root,,test,$MASTER_MYPORT,); --connection default --source ../include/hostcache_dump.inc -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv4_auth_plugin.test b/mysql-test/suite/perfschema/t/hostcache_ipv4_auth_plugin.test index 2ce251bb77b..f2321b32551 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv4_auth_plugin.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_auth_plugin.test @@ -29,7 +29,7 @@ select current_user(); disconnect con1; --connection default -set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4"; uninstall plugin test_plugin_server; --disable_query_log @@ -48,8 +48,8 @@ connect (con3,"127.0.0.1",plug,plug_dest,test,$MASTER_MYPORT,,,auth_test_plugin) --connection default --source ../include/hostcache_dump.inc ---replace_result $PLUGIN_AUTH PLUGIN_AUTH -eval install plugin test_plugin_server soname '$PLUGIN_AUTH'; +replace_result $AUTH_TEST_PLUGIN_SO PLUGIN_AUTH +eval install plugin test_plugin_server soname '$AUTH_TEST_PLUGIN_SO'; --disable_query_log --error ER_ACCESS_DENIED_ERROR @@ -85,5 +85,5 @@ REVOKE PROXY ON 'plug_dest'@'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= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv4_blocked.test b/mysql-test/suite/perfschema/t/hostcache_ipv4_blocked.test index fcfb1b9631b..31c93f9ca1c 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv4_blocked.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_blocked.test @@ -29,7 +29,7 @@ select current_user(); disconnect con1; --connection default -set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4,native_password_bad_reply"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4,native_password_bad_reply"; --disable_query_log --error ER_ACCESS_DENIED_ERROR @@ -86,5 +86,5 @@ revoke select on test.* from 'root'@'santa.claus.ipv4.example.com'; drop user 'root'@'santa.claus.ipv4.example.com'; set global max_connect_errors = @saved_max_connect_errors; -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv4_format.test b/mysql-test/suite/perfschema/t/hostcache_ipv4_format.test index a5a06171be7..de85c0ec3f5 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv4_format.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_format.test @@ -23,7 +23,7 @@ select current_user(); disconnect con1; --connection default -set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_format_ipv4"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_format_ipv4"; --disable_query_log --error ER_HOST_NOT_PRIVILEGED @@ -41,5 +41,5 @@ connect (con3,"127.0.0.1",root,,test,$MASTER_MYPORT,); --connection default --source ../include/hostcache_dump.inc -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv4_max_con-master.opt b/mysql-test/suite/perfschema/t/hostcache_ipv4_max_con-master.opt new file mode 100644 index 00000000000..87ad0bc3f2d --- /dev/null +++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_max_con-master.opt @@ -0,0 +1 @@ +--max-user-connections=1024 diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv4_max_con.test b/mysql-test/suite/perfschema/t/hostcache_ipv4_max_con.test index 98d9ccbe83b..a6c0e8ffeb7 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv4_max_con.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_max_con.test @@ -20,6 +20,7 @@ flush hosts; flush user_resources; select @@global.debug; select @@global.max_user_connections; +select @@global.max_user_connections into @saved_max_user_connections; select @@global.max_connections; select @@global.max_connections into @saved_max_connections; @@ -34,7 +35,7 @@ select current_user(); disconnect con1; --connection default -set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4"; connect (con2a,"127.0.0.1",quota,,test,$MASTER_MYPORT,); select "Con2a is alive"; @@ -242,9 +243,10 @@ disconnect con5b; --source ../include/wait_for_pfs_thread_count.inc set global max_connections = @saved_max_connections; +set global max_user_connections = @saved_max_user_connections; # revoke all privileges on test.* from 'quota'@'santa.claus.ipv4.example.com'; drop user 'quota'@'santa.claus.ipv4.example.com'; -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_again_allow.test b/mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_again_allow.test index de30b4a98d3..d333b46a8ad 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_again_allow.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_again_allow.test @@ -27,7 +27,7 @@ select current_user(); disconnect con1; --connection default -set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_error_again"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_error_again"; connect (con2,"127.0.0.1",root,,test,$MASTER_MYPORT,); select "Con2 is alive"; @@ -45,7 +45,7 @@ disconnect con3; --connection default --source ../include/hostcache_dump.inc -set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4"; connect (con4,"127.0.0.1",root,,test,$MASTER_MYPORT,); select "Con4 is alive"; @@ -68,5 +68,5 @@ revoke select on test.* from 'root'@'santa.claus.ipv4.example.com'; drop user 'root'@'192.0.2.4'; drop user 'root'@'santa.claus.ipv4.example.com'; -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_again_deny.test b/mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_again_deny.test index 4498d5921ac..e56a49789a0 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_again_deny.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_again_deny.test @@ -24,7 +24,7 @@ select current_user(); disconnect con1; --connection default -set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_error_again"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_error_again"; --disable_query_log --error ER_HOST_NOT_PRIVILEGED @@ -42,7 +42,7 @@ connect (con3,"127.0.0.1",root,,test,$MASTER_MYPORT,); --connection default --source ../include/hostcache_dump.inc -set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4"; --disable_query_log --error ER_HOST_NOT_PRIVILEGED @@ -60,5 +60,5 @@ connect (con5,"127.0.0.1",root,,test,$MASTER_MYPORT,); --connection default --source ../include/hostcache_dump.inc -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_noname_allow.test b/mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_noname_allow.test index c5a5e4d76a0..42d25467be5 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_noname_allow.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_noname_allow.test @@ -26,7 +26,7 @@ select current_user(); disconnect con1; --connection default -set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_error_noname"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_error_noname"; connect (con2,"127.0.0.1",root,,test,$MASTER_MYPORT,); select "Con2 is alive"; @@ -47,5 +47,5 @@ disconnect con3; revoke select on test.* from 'root'@'192.0.2.4'; drop user 'root'@'192.0.2.4'; -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_noname_deny.test b/mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_noname_deny.test index 9684f676818..d8cc7a4b58b 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_noname_deny.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_noname_deny.test @@ -24,7 +24,7 @@ select current_user(); disconnect con1; --connection default -set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_error_noname"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_error_noname"; --disable_query_log --error ER_HOST_NOT_PRIVILEGED @@ -42,5 +42,5 @@ connect (con3,"127.0.0.1",root,,test,$MASTER_MYPORT,); --connection default --source ../include/hostcache_dump.inc -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv4_passwd.test b/mysql-test/suite/perfschema/t/hostcache_ipv4_passwd.test index c77fc625954..1f9db150134 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv4_passwd.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_passwd.test @@ -29,7 +29,7 @@ select current_user(); disconnect con1; --connection default -set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4"; --disable_query_log --error ER_ACCESS_DENIED_ERROR @@ -82,5 +82,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= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv4_ssl.test b/mysql-test/suite/perfschema/t/hostcache_ipv4_ssl.test index 3e9161302d1..ffc029e451a 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv4_ssl.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_ssl.test @@ -33,7 +33,7 @@ select current_user(); disconnect con1; --connection default -set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4"; --disable_query_log --error ER_ACCESS_DENIED_ERROR @@ -70,5 +70,5 @@ connect (con2d,"127.0.0.1",user_ssl_x509,good_password,test,$MASTER_MYPORT,,SSL) drop user 'user_ssl'@'santa.claus.ipv4.example.com'; drop user 'user_ssl_x509'@'santa.claus.ipv4.example.com'; -set global debug= default; +set global debug_dbug= default; 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..68314d20f47 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 @@ -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; diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_again_deny.test b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_again_deny.test index 1b2f3f865dc..8764f2f7c5e 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_again_deny.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_again_deny.test @@ -25,7 +25,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"; --disable_query_log --error ER_HOST_NOT_PRIVILEGED @@ -43,5 +43,5 @@ connect (con3,"::1",root,,test,$MASTER_MYPORT,); --connection default --source ../include/hostcache_dump.inc -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_bad_allow.test b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_bad_allow.test index ad478a763e5..f62929050d4 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_bad_allow.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_bad_allow.test @@ -29,7 +29,7 @@ select current_user(); disconnect con1; --connection default -set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_bad_ipv6"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_bad_ipv6"; connect (con2,"::1",root,,test,$MASTER_MYPORT,); select "Con2 is alive"; @@ -50,5 +50,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; diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_bad_deny.test b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_bad_deny.test index 758fc973a34..d8e5e4a958a 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_bad_deny.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_bad_deny.test @@ -28,7 +28,7 @@ select current_user(); disconnect con1; --connection default -set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_bad_ipv6"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_bad_ipv6"; --disable_query_log --error ER_HOST_NOT_PRIVILEGED @@ -46,5 +46,5 @@ connect (con3,"::1",root,,test,$MASTER_MYPORT,); --connection default --source ../include/hostcache_dump.inc -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_good_allow.test b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_good_allow.test index 19a3c2d11f3..c21f6073174 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_good_allow.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_good_allow.test @@ -27,7 +27,7 @@ select current_user(); disconnect con1; --connection default -set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6"; connect (con2,"::1",root,,test,$MASTER_MYPORT,); select "Con2 is alive"; @@ -48,5 +48,5 @@ disconnect con3; revoke select on test.* from 'root'@'santa.claus.ipv6.example.com'; drop user 'root'@'santa.claus.ipv6.example.com'; -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_good_deny.test b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_good_deny.test index 543f056534a..cc60c08ac93 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_good_deny.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_good_deny.test @@ -21,7 +21,7 @@ select current_user(); disconnect con1; --connection default -set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6"; --disable_query_log --error ER_HOST_NOT_PRIVILEGED @@ -39,5 +39,5 @@ connect (con3,"::1",root,,test,$MASTER_MYPORT,); --connection default --source ../include/hostcache_dump.inc -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_noname_allow.test b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_noname_allow.test index be304140ba2..d66dd14c65f 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_noname_allow.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_noname_allow.test @@ -28,7 +28,7 @@ select current_user(); disconnect con1; --connection default -set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_error_noname"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_error_noname"; connect (con2,"::1",root,,test,$MASTER_MYPORT,); select "Con2 is alive"; @@ -51,5 +51,5 @@ revoke select on test.* from 'root'@'2001:db8::6:6'; drop user 'root'@'santa.claus.ipv6.example.com'; drop user 'root'@'2001:db8::6:6'; -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_noname_deny.test b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_noname_deny.test index 101abc86a20..c743b7639d7 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_noname_deny.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_noname_deny.test @@ -25,7 +25,7 @@ select current_user(); disconnect con1; --connection default -set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_error_noname"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_error_noname"; --disable_query_log --error ER_HOST_NOT_PRIVILEGED @@ -43,5 +43,5 @@ connect (con3,"::1",root,,test,$MASTER_MYPORT,); --connection default --source ../include/hostcache_dump.inc -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_auth_plugin.test b/mysql-test/suite/perfschema/t/hostcache_ipv6_auth_plugin.test index 89bbc016224..dc4bfe273d2 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv6_auth_plugin.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_auth_plugin.test @@ -30,7 +30,7 @@ select current_user(); disconnect con1; --connection default -set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6"; uninstall plugin test_plugin_server; --disable_query_log @@ -87,5 +87,5 @@ REVOKE PROXY ON 'plug_dest'@'santa.claus.ipv6.example.com' DROP USER 'plug'@'santa.claus.ipv6.example.com'; DROP USER 'plug_dest'@'santa.claus.ipv6.example.com'; -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_blocked.test b/mysql-test/suite/perfschema/t/hostcache_ipv6_blocked.test index ef276db982e..f4628df7ca6 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv6_blocked.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_blocked.test @@ -30,7 +30,7 @@ select current_user(); disconnect con1; --connection default -set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6,native_password_bad_reply"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6,native_password_bad_reply"; --disable_query_log --error ER_ACCESS_DENIED_ERROR @@ -87,5 +87,5 @@ revoke select on test.* from 'root'@'santa.claus.ipv6.example.com'; drop user 'root'@'santa.claus.ipv6.example.com'; set global max_connect_errors = @saved_max_connect_errors; -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_max_con-master.opt b/mysql-test/suite/perfschema/t/hostcache_ipv6_max_con-master.opt index a0a6079ec16..143ad44c2f2 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv6_max_con-master.opt +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_max_con-master.opt @@ -1 +1,2 @@ --bind-addr=:: +--max-user-connections=1024 diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_max_con.test b/mysql-test/suite/perfschema/t/hostcache_ipv6_max_con.test index c8d6d524cb0..12ea1c28bfc 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv6_max_con.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_max_con.test @@ -21,6 +21,7 @@ flush hosts; flush user_resources; select @@global.debug; select @@global.max_user_connections; +select @@global.max_user_connections into @saved_max_user_connections; select @@global.max_connections; select @@global.max_connections into @saved_max_connections; @@ -35,7 +36,7 @@ select current_user(); disconnect con1; --connection default -set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6"; connect (con2a,"::1",quota,,test,$MASTER_MYPORT,); select "Con2a is alive"; @@ -224,9 +225,10 @@ disconnect con5b; --source ../include/wait_for_pfs_thread_count.inc set global max_connections = @saved_max_connections; +set global max_user_connections = @saved_max_user_connections; # revoke all privileges on test.* from 'quota'@'santa.claus.ipv6.example.com'; drop user 'quota'@'santa.claus.ipv6.example.com'; -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_again_allow.test b/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_again_allow.test index ecf18ab55f4..fabd16be291 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_again_allow.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_again_allow.test @@ -28,7 +28,7 @@ select current_user(); disconnect con1; --connection default -set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_error_again"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_error_again"; connect (con2,"::1",root,,test,$MASTER_MYPORT,); select "Con2 is alive"; @@ -46,7 +46,7 @@ disconnect con3; --connection default --source ../include/hostcache_dump.inc -set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6"; connect (con4,"::1",root,,test,$MASTER_MYPORT,); select "Con4 is alive"; @@ -69,5 +69,5 @@ revoke select on test.* from 'root'@'santa.claus.ipv6.example.com'; drop user 'root'@'2001:db8::6:6'; drop user 'root'@'santa.claus.ipv6.example.com'; -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_again_deny.test b/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_again_deny.test index 510318fae53..c8e40862360 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_again_deny.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_again_deny.test @@ -25,7 +25,7 @@ select current_user(); disconnect con1; --connection default -set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_error_again"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_error_again"; --disable_query_log --error ER_HOST_NOT_PRIVILEGED @@ -43,7 +43,7 @@ connect (con3,"::1",root,,test,$MASTER_MYPORT,); --connection default --source ../include/hostcache_dump.inc -set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6"; --disable_query_log --error ER_HOST_NOT_PRIVILEGED @@ -61,5 +61,5 @@ connect (con5,"::1",root,,test,$MASTER_MYPORT,); --connection default --source ../include/hostcache_dump.inc -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_noname_allow.test b/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_noname_allow.test index 00b279aabe8..29fbd6aad4e 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_noname_allow.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_noname_allow.test @@ -27,7 +27,7 @@ select current_user(); disconnect con1; --connection default -set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_error_noname"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_error_noname"; 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; diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_noname_deny.test b/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_noname_deny.test index 03a207fccfb..218409f8f87 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_noname_deny.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_noname_deny.test @@ -25,7 +25,7 @@ select current_user(); disconnect con1; --connection default -set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_error_noname"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_error_noname"; --disable_query_log --error ER_HOST_NOT_PRIVILEGED @@ -43,5 +43,5 @@ connect (con3,"::1",root,,test,$MASTER_MYPORT,); --connection default --source ../include/hostcache_dump.inc -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_passwd.test b/mysql-test/suite/perfschema/t/hostcache_ipv6_passwd.test index 9de453544bb..9acb35ef616 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv6_passwd.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_passwd.test @@ -30,7 +30,7 @@ select current_user(); disconnect con1; --connection default -set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6"; --disable_query_log --error ER_ACCESS_DENIED_ERROR @@ -83,5 +83,5 @@ connect (con2f,"::1",user_with,wrong_password,test,$MASTER_MYPORT,); drop user 'user_with'@'santa.claus.ipv6.example.com'; drop user 'user_without'@'santa.claus.ipv6.example.com'; -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_ssl.test b/mysql-test/suite/perfschema/t/hostcache_ipv6_ssl.test index ce6f825f4fb..b7d119a0b07 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv6_ssl.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_ssl.test @@ -34,7 +34,7 @@ select current_user(); disconnect con1; --connection default -set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6"; --disable_query_log --error ER_ACCESS_DENIED_ERROR @@ -71,5 +71,5 @@ connect (con2d,"::1",user_ssl_x509,good_password,test,$MASTER_MYPORT,,SSL); drop user 'user_ssl'@'santa.claus.ipv6.example.com'; drop user 'user_ssl_x509'@'santa.claus.ipv6.example.com'; -set global debug= default; +set global debug_dbug= default; diff --git a/mysql-test/suite/perfschema/t/hostcache_peer_addr.test b/mysql-test/suite/perfschema/t/hostcache_peer_addr.test index 022e20a9a64..043139479a5 100644 --- a/mysql-test/suite/perfschema/t/hostcache_peer_addr.test +++ b/mysql-test/suite/perfschema/t/hostcache_peer_addr.test @@ -20,7 +20,7 @@ select current_user(); disconnect con1; --connection default -set global debug= "+d,vio_peer_addr_error"; +set global debug_dbug= "+d,vio_peer_addr_error"; --disable_query_log --error ER_BAD_HOST_ERROR @@ -40,7 +40,7 @@ connect (con3,"127.0.0.1",root,,test,$MASTER_MYPORT,); show global status like "connection_errors_%"; --source ../include/hostcache_dump.inc -set global debug= default; +set global debug_dbug= default; flush status; show global status like "connection_errors_%"; diff --git a/mysql-test/suite/perfschema/t/socket_connect.test b/mysql-test/suite/perfschema/t/socket_connect.test index 94625d2ed06..909840144ef 100644 --- a/mysql-test/suite/perfschema/t/socket_connect.test +++ b/mysql-test/suite/perfschema/t/socket_connect.test @@ -9,7 +9,7 @@ --source ../include/wait_for_pfs_thread_count.inc # Set this to enable debugging output -let $my_socket_debug=0; +let $my_socket_debug_dbug=0; --echo #============================================================================== --echo # Establish the level of IPV6 support diff --git a/mysql-test/suite/perfschema/t/socket_instances_func.test b/mysql-test/suite/perfschema/t/socket_instances_func.test index 5ed687a483b..12411103579 100644 --- a/mysql-test/suite/perfschema/t/socket_instances_func.test +++ b/mysql-test/suite/perfschema/t/socket_instances_func.test @@ -7,7 +7,7 @@ --source include/have_perfschema.inc # Set this to enable debugging output -let $my_socket_debug= 0; +let $my_socket_debug_dbug= 0; # # Set IP address defaults with respect to IPV6 support diff --git a/mysql-test/suite/perfschema/t/socket_instances_func_win.test b/mysql-test/suite/perfschema/t/socket_instances_func_win.test index 4b5fc07a85a..5faf0d24ec4 100644 --- a/mysql-test/suite/perfschema/t/socket_instances_func_win.test +++ b/mysql-test/suite/perfschema/t/socket_instances_func_win.test @@ -7,7 +7,7 @@ --source include/have_perfschema.inc # Set this to enable debugging output -let $my_socket_debug= 0; +let $my_socket_debug_dbug= 0; # # Set IP address defaults with respect to IPV6 support diff --git a/mysql-test/suite/perfschema/t/socket_summary_by_event_name_func.test b/mysql-test/suite/perfschema/t/socket_summary_by_event_name_func.test index 1c317cedcf5..5ba3af1e408 100644 --- a/mysql-test/suite/perfschema/t/socket_summary_by_event_name_func.test +++ b/mysql-test/suite/perfschema/t/socket_summary_by_event_name_func.test @@ -29,7 +29,7 @@ --source ../include/no_protocol.inc # Set this to enable debugging output -let $my_socket_debug= 0; +let $my_socket_debug_dbug= 0; --echo #============================================================================== --echo # Establish the level of IPV6 support diff --git a/mysql-test/suite/perfschema/t/socket_summary_by_instance_func.test b/mysql-test/suite/perfschema/t/socket_summary_by_instance_func.test index b039023dc6f..ef5096d85ff 100644 --- a/mysql-test/suite/perfschema/t/socket_summary_by_instance_func.test +++ b/mysql-test/suite/perfschema/t/socket_summary_by_instance_func.test @@ -43,7 +43,7 @@ # Set IP address defaults with respect to IPV6 support # # Set this to enable debugging output -let $my_socket_debug= 0; +let $my_socket_debug_dbug= 0; # # Determine if IPV6 supported # @@ -66,7 +66,7 @@ if($check_ipv4_mapped_supported) let $my_localhost=::ffff:127.0.0.1; } # -let $my_socket_debug= 0; +let $my_socket_debug_dbug= 0; if($my_socket_debug) { --echo IPV6=$check_ipv6_supported, IPV4_MAPPED = $check_ipv4_mapped_supported, LOCALHOST = $my_localhost diff --git a/mysql-test/suite/perfschema/t/socket_summary_by_instance_func_win.test b/mysql-test/suite/perfschema/t/socket_summary_by_instance_func_win.test index 80b7f3c2be7..5d4b4209b6e 100644 --- a/mysql-test/suite/perfschema/t/socket_summary_by_instance_func_win.test +++ b/mysql-test/suite/perfschema/t/socket_summary_by_instance_func_win.test @@ -45,7 +45,7 @@ # Set IP address defaults with respect to IPV6 support # # Set this to enable debugging output -let $my_socket_debug= 0; +let $my_socket_debug_dbug= 0; # # Determine if IPV6 supported # @@ -68,7 +68,7 @@ if($check_ipv4_mapped_supported) let $my_localhost=::ffff:127.0.0.1; } # -let $my_socket_debug= 0; +let $my_socket_debug_dbug= 0; if($my_socket_debug) { --echo IPV6=$check_ipv6_supported, IPV4_MAPPED = $check_ipv4_mapped_supported, LOCALHOST = $my_localhost |