3367 Marc Alff 2012-02-01
Work in progress
modified:
mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_allow.result
mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_deny.result
mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_allow.result
mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_deny.result
mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_allow.result
mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_deny.result
mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_allow.result
mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_deny.result
mysql-test/suite/perfschema/r/hostcache_ipv4_auth_plugin.result
mysql-test/suite/perfschema/r/hostcache_ipv4_blocked.result
mysql-test/suite/perfschema/r/hostcache_ipv4_format.result
mysql-test/suite/perfschema/r/hostcache_ipv4_max_con.result
mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_allow.result
mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_deny.result
mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_allow.result
mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_deny.result
mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_allow.result
mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_deny.result
mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_allow.result
mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_deny.result
mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_allow.result
mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_deny.result
mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_allow.result
mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_deny.result
mysql-test/suite/perfschema/r/hostcache_ipv6_auth_plugin.result
mysql-test/suite/perfschema/r/hostcache_ipv6_blocked.result
mysql-test/suite/perfschema/r/hostcache_ipv6_max_con.result
mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_allow.result
mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_deny.result
mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_allow.result
mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_deny.result
mysql-test/suite/perfschema/r/hostcache_peer_addr.result
mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_again_allow.test
mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_again_deny.test
mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_bad_allow.test
mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_bad_deny.test
mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_good_allow.test
mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_good_deny.test
mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_noname_allow.test
mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_noname_deny.test
mysql-test/suite/perfschema/t/hostcache_ipv4_auth_plugin.test
mysql-test/suite/perfschema/t/hostcache_ipv4_blocked.test
mysql-test/suite/perfschema/t/hostcache_ipv4_format.test
mysql-test/suite/perfschema/t/hostcache_ipv4_max_con.test
mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_again_allow.test
mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_again_deny.test
mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_noname_allow.test
mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_noname_deny.test
mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_again_allow.test
mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_again_deny.test
mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_bad_allow.test
mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_bad_deny.test
mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_good_allow.test
mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_good_deny.test
mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_noname_allow.test
mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_noname_deny.test
mysql-test/suite/perfschema/t/hostcache_ipv6_auth_plugin.test
mysql-test/suite/perfschema/t/hostcache_ipv6_blocked.test
mysql-test/suite/perfschema/t/hostcache_ipv6_max_con.test
mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_again_allow.test
mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_again_deny.test
mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_noname_allow.test
mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_noname_deny.test
mysql-test/suite/perfschema/t/hostcache_peer_addr.test
sql/mysqld.cc
sql/mysqld.h
sql/sql_connect.cc
3366 Marc Alff 2012-01-31 [merge]
Merge mysql-trunk --> mysql-trunk-wl5259
added:
mysql-test/suite/opt_trace/r/eq_range_statistics.result
mysql-test/suite/opt_trace/t/eq_range_statistics.test
mysql-test/suite/sys_vars/r/eq_range_index_dive_limit_basic.result
mysql-test/suite/sys_vars/t/eq_range_index_dive_limit_basic.test
modified:
include/my_base.h
libmysql/CMakeLists.txt
mysql-test/include/join_cache.inc
mysql-test/include/subquery_mat.inc
mysql-test/include/subquery_sj.inc
mysql-test/include/wait_for_slave_io_error.inc
mysql-test/r/change_user.result
mysql-test/r/connect.result
mysql-test/r/derived.result
mysql-test/r/greedy_optimizer.result
mysql-test/r/join_cache_bka.result
mysql-test/r/join_cache_bka_nixbnl.result
mysql-test/r/join_cache_bkaunique.result
mysql-test/r/join_cache_bnl.result
mysql-test/r/join_cache_nojb.result
mysql-test/r/join_nested.result
mysql-test/r/join_nested_bka.result
mysql-test/r/join_nested_bka_nixbnl.result
mysql-test/r/mysql_upgrade.result
mysql-test/r/mysqld--help-notwin.result
mysql-test/r/mysqld--help-win.result
mysql-test/r/subquery_mat.result
mysql-test/r/subquery_mat_all.result
mysql-test/r/subquery_mat_none.result
mysql-test/r/subquery_sj_all.result
mysql-test/r/subquery_sj_all_bka.result
mysql-test/r/subquery_sj_all_bka_nixbnl.result
mysql-test/r/subquery_sj_all_bkaunique.result
mysql-test/r/subquery_sj_dupsweed.result
mysql-test/r/subquery_sj_dupsweed_bka.result
mysql-test/r/subquery_sj_dupsweed_bka_nixbnl.result
mysql-test/r/subquery_sj_dupsweed_bkaunique.result
mysql-test/r/subquery_sj_firstmatch.result
mysql-test/r/subquery_sj_firstmatch_bka.result
mysql-test/r/subquery_sj_firstmatch_bka_nixbnl.result
mysql-test/r/subquery_sj_firstmatch_bkaunique.result
mysql-test/r/subquery_sj_loosescan.result
mysql-test/r/subquery_sj_loosescan_bka.result
mysql-test/r/subquery_sj_loosescan_bka_nixbnl.result
mysql-test/r/subquery_sj_loosescan_bkaunique.result
mysql-test/r/subquery_sj_mat.result
mysql-test/r/subquery_sj_mat_bka.result
mysql-test/r/subquery_sj_mat_bka_nixbnl.result
mysql-test/r/subquery_sj_mat_bkaunique.result
mysql-test/r/subquery_sj_mat_nosj.result
mysql-test/r/subquery_sj_none.result
mysql-test/r/subquery_sj_none_bka.result
mysql-test/r/subquery_sj_none_bka_nixbnl.result
mysql-test/r/subquery_sj_none_bkaunique.result
mysql-test/suite/opt_trace/r/bugs_no_prot_all.result
mysql-test/suite/opt_trace/r/bugs_no_prot_none.result
mysql-test/suite/opt_trace/r/bugs_ps_prot_all.result
mysql-test/suite/opt_trace/r/bugs_ps_prot_none.result
mysql-test/suite/opt_trace/r/charset.result
mysql-test/suite/opt_trace/r/general2_no_prot.result
mysql-test/suite/opt_trace/r/general2_ps_prot.result
mysql-test/suite/opt_trace/r/general_no_prot_all.result
mysql-test/suite/opt_trace/r/general_no_prot_none.result
mysql-test/suite/opt_trace/r/general_ps_prot_all.result
mysql-test/suite/opt_trace/r/general_ps_prot_none.result
mysql-test/suite/opt_trace/r/range_no_prot.result
mysql-test/suite/opt_trace/r/range_ps_prot.result
mysql-test/suite/opt_trace/r/subquery_no_prot.result
mysql-test/suite/opt_trace/r/subquery_ps_prot.result
mysql-test/suite/rpl/r/rpl_checksum.result
mysql-test/suite/rpl/r/rpl_log_pos.result
mysql-test/suite/rpl/r/rpl_manual_change_index_file.result
mysql-test/suite/rpl/r/rpl_packet.result
mysql-test/suite/rpl/r/rpl_row_event_max_size.result
mysql-test/suite/rpl/t/rpl_checksum.test
mysql-test/suite/rpl/t/rpl_log_pos.test
mysql-test/suite/rpl/t/rpl_manual_change_index_file.test
mysql-test/suite/rpl/t/rpl_packet.test
mysql-test/suite/rpl/t/rpl_row_event_max_size.test
mysql-test/suite/sys_vars/r/old_passwords_func.result
mysql-test/suite/sys_vars/r/secure_auth_basic.result
mysql-test/suite/sys_vars/r/secure_auth_func.result
mysql-test/suite/sys_vars/t/secure_auth_basic.test
mysql-test/t/change_user.test
mysql-test/t/connect.test
mysql-test/t/mysql_upgrade.test
scripts/mysql_system_tables_fix.sql
sql/filesort.cc
sql/filesort_utils.h
sql/handler.cc
sql/opt_range.cc
sql/sql_acl.cc
sql/sql_class.h
sql/sql_join_buffer.cc
sql/sql_join_buffer.h
sql/sql_optimizer.cc
sql/sql_optimizer.h
sql/sql_select.cc
sql/structs.h
sql/sys_vars.cc
sql/table.h
storage/innobase/os/os0file.cc
unittest/gunit/filesort_buffer-t.cc
=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_allow.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_allow.result 2012-01-30 10:39:47 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_allow.result 2012-02-01 17:24:09 +0000
@@ -4,9 +4,6 @@ flush hosts;
select @@global.debug;
@@global.debug
-show global status like "%peer%";
-Variable_name Value
-Peer_address_errors 0
grant select on test.* to 'root'@'192.0.2.4';
select "Con1 is alive";
Con1 is alive
=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_deny.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_deny.result 2012-01-27 12:14:54 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_deny.result 2012-02-01 17:24:09 +0000
@@ -4,9 +4,6 @@ flush hosts;
select @@global.debug;
@@global.debug
-show global status like "%peer%";
-Variable_name Value
-Peer_address_errors 0
select "Con1 is alive";
Con1 is alive
Con1 is alive
=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_allow.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_allow.result 2012-01-27 12:14:54 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_allow.result 2012-02-01 17:24:09 +0000
@@ -4,9 +4,6 @@ flush hosts;
select @@global.debug;
@@global.debug
-show global status like "%peer%";
-Variable_name Value
-Peer_address_errors 0
grant select on test.* to 'root'@'192.0.2.4';
select "Con1 is alive";
Con1 is alive
=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_deny.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_deny.result 2012-01-27 12:14:54 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_deny.result 2012-02-01 17:24:09 +0000
@@ -4,9 +4,6 @@ flush hosts;
select @@global.debug;
@@global.debug
-show global status like "%peer%";
-Variable_name Value
-Peer_address_errors 0
select "Con1 is alive";
Con1 is alive
Con1 is alive
=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_allow.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_allow.result 2012-01-27 12:14:54 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_allow.result 2012-02-01 17:24:09 +0000
@@ -4,9 +4,6 @@ flush hosts;
select @@global.debug;
@@global.debug
-show global status like "%peer%";
-Variable_name Value
-Peer_address_errors 0
grant select on test.* to 'root'@'santa.claus.ipv4.example.com';
select "Con1 is alive";
Con1 is alive
=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_deny.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_deny.result 2012-01-27 12:14:54 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_deny.result 2012-02-01 17:24:09 +0000
@@ -4,9 +4,6 @@ flush hosts;
select @@global.debug;
@@global.debug
-show global status like "%peer%";
-Variable_name Value
-Peer_address_errors 0
select "Con1 is alive";
Con1 is alive
Con1 is alive
=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_allow.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_allow.result 2012-01-27 12:14:54 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_allow.result 2012-02-01 17:24:09 +0000
@@ -4,9 +4,6 @@ flush hosts;
select @@global.debug;
@@global.debug
-show global status like "%peer%";
-Variable_name Value
-Peer_address_errors 0
grant select on test.* to 'root'@'santa.claus.ipv4.example.com';
grant select on test.* to 'root'@'192.0.2.4';
select "Con1 is alive";
=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_deny.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_deny.result 2012-01-27 12:14:54 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_deny.result 2012-02-01 17:24:09 +0000
@@ -4,9 +4,6 @@ flush hosts;
select @@global.debug;
@@global.debug
-show global status like "%peer%";
-Variable_name Value
-Peer_address_errors 0
select "Con1 is alive";
Con1 is alive
Con1 is alive
=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv4_auth_plugin.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_auth_plugin.result 2012-01-30 10:39:47 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_auth_plugin.result 2012-02-01 17:24:09 +0000
@@ -3,9 +3,6 @@ flush hosts;
select @@global.debug;
@@global.debug
-show global status like "%peer%";
-Variable_name Value
-Peer_address_errors 0
CREATE USER 'plug'@'santa.claus.ipv4.example.com'
IDENTIFIED WITH 'test_plugin_server' AS 'plug_dest';
CREATE USER 'plug_dest'@'santa.claus.ipv4.example.com'
=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv4_blocked.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_blocked.result 2012-01-30 19:03:41 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_blocked.result 2012-02-01 17:24:09 +0000
@@ -8,9 +8,6 @@ select @@global.max_connect_errors;
@@global.max_connect_errors
10
select @@global.max_connect_errors into @saved_max_connect_errors;
-show global status like "%peer%";
-Variable_name Value
-Peer_address_errors 0
set global max_connect_errors = 2;
grant select on test.* to 'root'@'santa.claus.ipv4.example.com';
select "Con1 is alive";
=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv4_format.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_format.result 2012-01-27 12:14:54 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_format.result 2012-02-01 17:24:09 +0000
@@ -4,9 +4,6 @@ flush hosts;
select @@global.debug;
@@global.debug
-show global status like "%peer%";
-Variable_name Value
-Peer_address_errors 0
select "Con1 is alive";
Con1 is alive
Con1 is alive
=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv4_max_con.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_max_con.result 2012-01-30 10:39:47 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_max_con.result 2012-02-01 17:24:09 +0000
@@ -11,9 +11,6 @@ select @@global.max_connections;
@@global.max_connections
151
select @@global.max_connections into @saved_max_connections;
-show global status like "%peer%";
-Variable_name Value
-Peer_address_errors 0
create user 'quota'@'santa.claus.ipv4.example.com';
grant select on test.* to 'quota'@'santa.claus.ipv4.example.com';
grant usage on *.* to 'quota'@'santa.claus.ipv4.example.com'
=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_allow.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_allow.result 2012-01-27 12:14:54 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_allow.result 2012-02-01 17:24:09 +0000
@@ -4,9 +4,6 @@ flush hosts;
select @@global.debug;
@@global.debug
-show global status like "%peer%";
-Variable_name Value
-Peer_address_errors 0
grant select on test.* to 'root'@'192.0.2.4';
grant select on test.* to 'root'@'santa.claus.ipv4.example.com';
select "Con1 is alive";
=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_deny.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_deny.result 2012-01-27 12:14:54 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_deny.result 2012-02-01 17:24:09 +0000
@@ -4,9 +4,6 @@ flush hosts;
select @@global.debug;
@@global.debug
-show global status like "%peer%";
-Variable_name Value
-Peer_address_errors 0
select "Con1 is alive";
Con1 is alive
Con1 is alive
=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_allow.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_allow.result 2012-01-27 12:14:54 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_allow.result 2012-02-01 17:24:09 +0000
@@ -4,9 +4,6 @@ flush hosts;
select @@global.debug;
@@global.debug
-show global status like "%peer%";
-Variable_name Value
-Peer_address_errors 0
grant select on test.* to 'root'@'192.0.2.4';
select "Con1 is alive";
Con1 is alive
=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_deny.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_deny.result 2012-01-27 12:14:54 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_deny.result 2012-02-01 17:24:09 +0000
@@ -4,9 +4,6 @@ flush hosts;
select @@global.debug;
@@global.debug
-show global status like "%peer%";
-Variable_name Value
-Peer_address_errors 0
select "Con1 is alive";
Con1 is alive
Con1 is alive
=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_allow.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_allow.result 2012-01-30 10:39:47 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_allow.result 2012-02-01 17:24:09 +0000
@@ -4,9 +4,6 @@ flush hosts;
select @@global.debug;
@@global.debug
-show global status like "%peer%";
-Variable_name Value
-Peer_address_errors 0
grant select on test.* to 'root'@'2001:db8::6:6';
select "Con1 is alive";
Con1 is alive
=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_deny.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_deny.result 2012-01-27 12:14:54 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_deny.result 2012-02-01 17:24:09 +0000
@@ -4,9 +4,6 @@ flush hosts;
select @@global.debug;
@@global.debug
-show global status like "%peer%";
-Variable_name Value
-Peer_address_errors 0
select "Con1 is alive";
Con1 is alive
Con1 is alive
=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_allow.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_allow.result 2012-01-30 10:39:47 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_allow.result 2012-02-01 17:24:09 +0000
@@ -4,9 +4,6 @@ flush hosts;
select @@global.debug;
@@global.debug
-show global status like "%peer%";
-Variable_name Value
-Peer_address_errors 0
grant select on test.* to 'root'@'2001:db8::6:6';
select "Con1 is alive";
Con1 is alive
=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_deny.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_deny.result 2012-01-27 12:14:54 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_deny.result 2012-02-01 17:24:09 +0000
@@ -4,9 +4,6 @@ flush hosts;
select @@global.debug;
@@global.debug
-show global status like "%peer%";
-Variable_name Value
-Peer_address_errors 0
select "Con1 is alive";
Con1 is alive
Con1 is alive
=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_allow.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_allow.result 2012-01-27 12:14:54 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_allow.result 2012-02-01 17:24:09 +0000
@@ -4,9 +4,6 @@ flush hosts;
select @@global.debug;
@@global.debug
-show global status like "%peer%";
-Variable_name Value
-Peer_address_errors 0
grant select on test.* to 'root'@'santa.claus.ipv6.example.com';
select "Con1 is alive";
Con1 is alive
=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_deny.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_deny.result 2012-01-27 12:14:54 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_deny.result 2012-02-01 17:24:09 +0000
@@ -3,9 +3,6 @@ flush hosts;
select @@global.debug;
@@global.debug
-show global status like "%peer%";
-Variable_name Value
-Peer_address_errors 0
select "Con1 is alive";
Con1 is alive
Con1 is alive
=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_allow.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_allow.result 2012-01-30 10:39:47 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_allow.result 2012-02-01 17:24:09 +0000
@@ -4,9 +4,6 @@ flush hosts;
select @@global.debug;
@@global.debug
-show global status like "%peer%";
-Variable_name Value
-Peer_address_errors 0
grant select on test.* to 'root'@'santa.claus.ipv6.example.com';
grant select on test.* to 'root'@'2001:db8::6:6';
select "Con1 is alive";
=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_deny.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_deny.result 2012-01-27 12:14:54 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_deny.result 2012-02-01 17:24:09 +0000
@@ -4,9 +4,6 @@ flush hosts;
select @@global.debug;
@@global.debug
-show global status like "%peer%";
-Variable_name Value
-Peer_address_errors 0
select "Con1 is alive";
Con1 is alive
Con1 is alive
=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv6_auth_plugin.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_auth_plugin.result 2012-01-30 10:39:47 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_auth_plugin.result 2012-02-01 17:24:09 +0000
@@ -3,9 +3,6 @@ flush hosts;
select @@global.debug;
@@global.debug
-show global status like "%peer%";
-Variable_name Value
-Peer_address_errors 0
CREATE USER 'plug'@'santa.claus.ipv6.example.com'
IDENTIFIED WITH 'test_plugin_server' AS 'plug_dest';
CREATE USER 'plug_dest'@'santa.claus.ipv6.example.com'
=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv6_blocked.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_blocked.result 2012-01-30 19:03:41 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_blocked.result 2012-02-01 17:24:09 +0000
@@ -8,9 +8,6 @@ select @@global.max_connect_errors;
@@global.max_connect_errors
10
select @@global.max_connect_errors into @saved_max_connect_errors;
-show global status like "%peer%";
-Variable_name Value
-Peer_address_errors 0
set global max_connect_errors = 2;
grant select on test.* to 'root'@'santa.claus.ipv6.example.com';
select "Con1 is alive";
=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv6_max_con.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_max_con.result 2012-01-30 10:39:47 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_max_con.result 2012-02-01 17:24:09 +0000
@@ -11,9 +11,6 @@ select @@global.max_connections;
@@global.max_connections
151
select @@global.max_connections into @saved_max_connections;
-show global status like "%peer%";
-Variable_name Value
-Peer_address_errors 0
create user 'quota'@'santa.claus.ipv6.example.com';
grant select on test.* to 'quota'@'santa.claus.ipv6.example.com';
grant usage on *.* to 'quota'@'santa.claus.ipv6.example.com'
=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_allow.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_allow.result 2012-01-30 10:39:47 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_allow.result 2012-02-01 17:24:09 +0000
@@ -4,9 +4,6 @@ flush hosts;
select @@global.debug;
@@global.debug
-show global status like "%peer%";
-Variable_name Value
-Peer_address_errors 0
grant select on test.* to 'root'@'2001:db8::6:6';
grant select on test.* to 'root'@'santa.claus.ipv6.example.com';
select "Con1 is alive";
=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_deny.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_deny.result 2012-01-27 12:14:54 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_deny.result 2012-02-01 17:24:09 +0000
@@ -4,9 +4,6 @@ flush hosts;
select @@global.debug;
@@global.debug
-show global status like "%peer%";
-Variable_name Value
-Peer_address_errors 0
select "Con1 is alive";
Con1 is alive
Con1 is alive
=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_allow.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_allow.result 2012-01-30 10:39:47 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_allow.result 2012-02-01 17:24:09 +0000
@@ -4,9 +4,6 @@ flush hosts;
select @@global.debug;
@@global.debug
-show global status like "%peer%";
-Variable_name Value
-Peer_address_errors 0
grant select on test.* to 'root'@'2001:db8::6:6';
select "Con1 is alive";
Con1 is alive
=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_deny.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_deny.result 2012-01-27 12:14:54 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_deny.result 2012-02-01 17:24:09 +0000
@@ -4,9 +4,6 @@ flush hosts;
select @@global.debug;
@@global.debug
-show global status like "%peer%";
-Variable_name Value
-Peer_address_errors 0
select "Con1 is alive";
Con1 is alive
Con1 is alive
=== modified file 'mysql-test/suite/perfschema/r/hostcache_peer_addr.result'
--- a/mysql-test/suite/perfschema/r/hostcache_peer_addr.result 2012-01-26 10:10:55 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_peer_addr.result 2012-02-01 17:24:09 +0000
@@ -3,9 +3,14 @@ flush hosts;
select @@global.debug;
@@global.debug
-show global status like "%peer%";
+show global status like "connection_%_errors";
Variable_name Value
-Peer_address_errors 0
+Connection_accept_errors 0
+Connection_internal_errors 0
+Connection_max_connection_errors 0
+Connection_peer_address_errors 0
+Connection_select_errors 0
+Connection_tcpwrap_errors 0
select "Con1 is alive";
Con1 is alive
Con1 is alive
@@ -14,9 +19,14 @@ current_user()
root@localhost
set global debug= "+d,vio_peer_addr_error";
ERROR HY000: Can't get hostname for your address
-show global status like "%peer%";
+show global status like "connection_%_errors";
Variable_name Value
-Peer_address_errors 1
+Connection_accept_errors 0
+Connection_internal_errors 0
+Connection_max_connection_errors 0
+Connection_peer_address_errors 1
+Connection_select_errors 0
+Connection_tcpwrap_errors 0
select
IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
COUNT_HOST_BLOCKED_ERRORS,
@@ -44,9 +54,14 @@ if (FIRST_ERROR_SEEN is not null, "set",
if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
from performance_schema.host_cache;
ERROR HY000: Can't get hostname for your address
-show global status like "%peer%";
+show global status like "connection_%_errors";
Variable_name Value
-Peer_address_errors 2
+Connection_accept_errors 0
+Connection_internal_errors 0
+Connection_max_connection_errors 0
+Connection_peer_address_errors 2
+Connection_select_errors 0
+Connection_tcpwrap_errors 0
select
IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
COUNT_HOST_BLOCKED_ERRORS,
@@ -75,6 +90,11 @@ if (LAST_ERROR_SEEN is not null, "set",
from performance_schema.host_cache;
set global debug= default;
flush status;
-show global status like "%peer%";
+show global status like "connection_%_errors";
Variable_name Value
-Peer_address_errors 0
+Connection_accept_errors 0
+Connection_internal_errors 0
+Connection_max_connection_errors 0
+Connection_peer_address_errors 0
+Connection_select_errors 0
+Connection_tcpwrap_errors 0
=== modified file 'mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_again_allow.test'
--- a/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_again_allow.test 2012-01-30 10:39:47 +0000
+++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_again_allow.test 2012-02-01 17:24:09 +0000
@@ -17,7 +17,6 @@ call mtr.add_suppression("santa.claus.ip
flush status;
flush hosts;
select @@global.debug;
-show global status like "%peer%";
grant select on test.* to 'root'@'192.0.2.4';
=== modified file 'mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_again_deny.test'
--- a/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_again_deny.test 2012-01-27 12:14:54 +0000
+++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_again_deny.test 2012-02-01 17:24:09 +0000
@@ -17,7 +17,6 @@ call mtr.add_suppression("santa.claus.ip
flush status;
flush hosts;
select @@global.debug;
-show global status like "%peer%";
connect (con1,"127.0.0.1",root,,test,$MASTER_MYPORT,);
select "Con1 is alive";
=== modified file 'mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_bad_allow.test'
--- a/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_bad_allow.test 2012-01-27 12:14:54 +0000
+++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_bad_allow.test 2012-02-01 17:24:09 +0000
@@ -19,7 +19,6 @@ call mtr.add_suppression("santa.claus.ip
flush status;
flush hosts;
select @@global.debug;
-show global status like "%peer%";
grant select on test.* to 'root'@'192.0.2.4';
=== modified file 'mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_bad_deny.test'
--- a/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_bad_deny.test 2012-01-27 12:14:54 +0000
+++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_bad_deny.test 2012-02-01 17:24:09 +0000
@@ -19,7 +19,6 @@ call mtr.add_suppression("santa.claus.ip
flush status;
flush hosts;
select @@global.debug;
-show global status like "%peer%";
connect (con1,"127.0.0.1",root,,test,$MASTER_MYPORT,);
select "Con1 is alive";
=== modified file 'mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_good_allow.test'
--- a/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_good_allow.test 2012-01-27 12:14:54 +0000
+++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_good_allow.test 2012-02-01 17:24:09 +0000
@@ -17,7 +17,6 @@ call mtr.add_suppression("192.0.2.4");
flush status;
flush hosts;
select @@global.debug;
-show global status like "%peer%";
grant select on test.* to 'root'@'santa.claus.ipv4.example.com';
=== modified file 'mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_good_deny.test'
--- a/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_good_deny.test 2012-01-27 12:14:54 +0000
+++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_good_deny.test 2012-02-01 17:24:09 +0000
@@ -17,7 +17,6 @@ call mtr.add_suppression("192.0.2.4");
flush status;
flush hosts;
select @@global.debug;
-show global status like "%peer%";
connect (con1,"127.0.0.1",root,,test,$MASTER_MYPORT,);
select "Con1 is alive";
=== modified file 'mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_noname_allow.test'
--- a/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_noname_allow.test 2012-01-27 12:14:54 +0000
+++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_noname_allow.test 2012-02-01 17:24:09 +0000
@@ -17,7 +17,6 @@ call mtr.add_suppression("santa.claus.ip
flush status;
flush hosts;
select @@global.debug;
-show global status like "%peer%";
grant select on test.* to 'root'@'santa.claus.ipv4.example.com';
grant select on test.* to 'root'@'192.0.2.4';
=== modified file 'mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_noname_deny.test'
--- a/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_noname_deny.test 2012-01-27 12:14:54 +0000
+++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_noname_deny.test 2012-02-01 17:24:09 +0000
@@ -17,7 +17,6 @@ call mtr.add_suppression("santa.claus.ip
flush status;
flush hosts;
select @@global.debug;
-show global status like "%peer%";
connect (con1,"127.0.0.1",root,,test,$MASTER_MYPORT,);
select "Con1 is alive";
=== modified file 'mysql-test/suite/perfschema/t/hostcache_ipv4_auth_plugin.test'
--- a/mysql-test/suite/perfschema/t/hostcache_ipv4_auth_plugin.test 2012-01-30 10:39:47 +0000
+++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_auth_plugin.test 2012-02-01 17:24:09 +0000
@@ -16,7 +16,6 @@
flush status;
flush hosts;
select @@global.debug;
-show global status like "%peer%";
CREATE USER 'plug'@'santa.claus.ipv4.example.com'
IDENTIFIED WITH 'test_plugin_server' AS 'plug_dest';
=== modified file 'mysql-test/suite/perfschema/t/hostcache_ipv4_blocked.test'
--- a/mysql-test/suite/perfschema/t/hostcache_ipv4_blocked.test 2012-01-30 19:03:41 +0000
+++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_blocked.test 2012-02-01 17:24:09 +0000
@@ -18,7 +18,6 @@ flush user_resources;
select @@global.debug;
select @@global.max_connect_errors;
select @@global.max_connect_errors into @saved_max_connect_errors;
-show global status like "%peer%";
set global max_connect_errors = 2;
=== modified file 'mysql-test/suite/perfschema/t/hostcache_ipv4_format.test'
--- a/mysql-test/suite/perfschema/t/hostcache_ipv4_format.test 2012-01-27 12:14:54 +0000
+++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_format.test 2012-02-01 17:24:09 +0000
@@ -16,7 +16,6 @@ call mtr.add_suppression("192.0.2.4");
flush status;
flush hosts;
select @@global.debug;
-show global status like "%peer%";
connect (con1,"127.0.0.1",root,,test,$MASTER_MYPORT,);
select "Con1 is alive";
=== modified file 'mysql-test/suite/perfschema/t/hostcache_ipv4_max_con.test'
--- a/mysql-test/suite/perfschema/t/hostcache_ipv4_max_con.test 2012-01-30 10:39:47 +0000
+++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_max_con.test 2012-02-01 17:24:09 +0000
@@ -19,7 +19,6 @@ select @@global.debug;
select @@global.max_user_connections;
select @@global.max_connections;
select @@global.max_connections into @saved_max_connections;
-show global status like "%peer%";
create user 'quota'@'santa.claus.ipv4.example.com';
grant select on test.* to 'quota'@'santa.claus.ipv4.example.com';
=== modified file 'mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_again_allow.test'
--- a/mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_again_allow.test 2012-01-27 12:14:54 +0000
+++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_again_allow.test 2012-02-01 17:24:09 +0000
@@ -17,7 +17,6 @@ call mtr.add_suppression("192.0.2.4");
flush status;
flush hosts;
select @@global.debug;
-show global status like "%peer%";
grant select on test.* to 'root'@'192.0.2.4';
grant select on test.* to 'root'@'santa.claus.ipv4.example.com';
=== modified file 'mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_again_deny.test'
--- a/mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_again_deny.test 2012-01-27 12:14:54 +0000
+++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_again_deny.test 2012-02-01 17:24:09 +0000
@@ -17,7 +17,6 @@ call mtr.add_suppression("192.0.2.4");
flush status;
flush hosts;
select @@global.debug;
-show global status like "%peer%";
connect (con1,"127.0.0.1",root,,test,$MASTER_MYPORT,);
select "Con1 is alive";
=== modified file 'mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_noname_allow.test'
--- a/mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_noname_allow.test 2012-01-27 12:14:54 +0000
+++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_noname_allow.test 2012-02-01 17:24:09 +0000
@@ -17,7 +17,6 @@ call mtr.add_suppression("192.0.2.4");
flush status;
flush hosts;
select @@global.debug;
-show global status like "%peer%";
grant select on test.* to 'root'@'192.0.2.4';
=== modified file 'mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_noname_deny.test'
--- a/mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_noname_deny.test 2012-01-27 12:14:54 +0000
+++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_noname_deny.test 2012-02-01 17:24:09 +0000
@@ -17,7 +17,6 @@ call mtr.add_suppression("192.0.2.4");
flush status;
flush hosts;
select @@global.debug;
-show global status like "%peer%";
connect (con1,"127.0.0.1",root,,test,$MASTER_MYPORT,);
select "Con1 is alive";
=== modified file 'mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_again_allow.test'
--- a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_again_allow.test 2012-01-30 10:39:47 +0000
+++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_again_allow.test 2012-02-01 17:24:09 +0000
@@ -18,7 +18,6 @@ call mtr.add_suppression("santa.claus.ip
flush status;
flush hosts;
select @@global.debug;
-show global status like "%peer%";
grant select on test.* to 'root'@'2001:db8::6:6';
=== modified file 'mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_again_deny.test'
--- a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_again_deny.test 2012-01-27 12:14:54 +0000
+++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_again_deny.test 2012-02-01 17:24:09 +0000
@@ -18,7 +18,6 @@ call mtr.add_suppression("santa.claus.ip
flush status;
flush hosts;
select @@global.debug;
-show global status like "%peer%";
connect (con1,"::1",root,,test,$MASTER_MYPORT,);
select "Con1 is alive";
=== modified file 'mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_bad_allow.test'
--- a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_bad_allow.test 2012-01-30 10:39:47 +0000
+++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_bad_allow.test 2012-02-01 17:24:09 +0000
@@ -20,7 +20,6 @@ call mtr.add_suppression("santa.claus.ip
flush status;
flush hosts;
select @@global.debug;
-show global status like "%peer%";
grant select on test.* to 'root'@'2001:db8::6:6';
=== modified file 'mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_bad_deny.test'
--- a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_bad_deny.test 2012-01-27 12:14:54 +0000
+++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_bad_deny.test 2012-02-01 17:24:09 +0000
@@ -21,7 +21,6 @@ call mtr.add_suppression("santa.claus.ip
flush status;
flush hosts;
select @@global.debug;
-show global status like "%peer%";
connect (con1,"::1",root,,test,$MASTER_MYPORT,);
select "Con1 is alive";
=== modified file 'mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_good_allow.test'
--- a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_good_allow.test 2012-01-27 12:14:54 +0000
+++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_good_allow.test 2012-02-01 17:24:09 +0000
@@ -18,7 +18,6 @@ call mtr.add_suppression("192.0.2.4");
flush status;
flush hosts;
select @@global.debug;
-show global status like "%peer%";
grant select on test.* to 'root'@'santa.claus.ipv6.example.com';
=== modified file 'mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_good_deny.test'
--- a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_good_deny.test 2012-01-27 12:14:54 +0000
+++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_good_deny.test 2012-02-01 17:24:09 +0000
@@ -14,7 +14,6 @@
flush status;
flush hosts;
select @@global.debug;
-show global status like "%peer%";
connect (con1,"::1",root,,test,$MASTER_MYPORT,);
select "Con1 is alive";
=== modified file 'mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_noname_allow.test'
--- a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_noname_allow.test 2012-01-30 10:39:47 +0000
+++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_noname_allow.test 2012-02-01 17:24:09 +0000
@@ -18,7 +18,6 @@ call mtr.add_suppression("santa.claus.ip
flush status;
flush hosts;
select @@global.debug;
-show global status like "%peer%";
grant select on test.* to 'root'@'santa.claus.ipv6.example.com';
grant select on test.* to 'root'@'2001:db8::6:6';
=== modified file 'mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_noname_deny.test'
--- a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_noname_deny.test 2012-01-27 12:14:54 +0000
+++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_noname_deny.test 2012-02-01 17:24:09 +0000
@@ -18,7 +18,6 @@ call mtr.add_suppression("santa.claus.ip
flush status;
flush hosts;
select @@global.debug;
-show global status like "%peer%";
connect (con1,"::1",root,,test,$MASTER_MYPORT,);
select "Con1 is alive";
=== modified file 'mysql-test/suite/perfschema/t/hostcache_ipv6_auth_plugin.test'
--- a/mysql-test/suite/perfschema/t/hostcache_ipv6_auth_plugin.test 2012-01-30 10:39:47 +0000
+++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_auth_plugin.test 2012-02-01 17:24:09 +0000
@@ -17,7 +17,6 @@
flush status;
flush hosts;
select @@global.debug;
-show global status like "%peer%";
CREATE USER 'plug'@'santa.claus.ipv6.example.com'
IDENTIFIED WITH 'test_plugin_server' AS 'plug_dest';
=== modified file 'mysql-test/suite/perfschema/t/hostcache_ipv6_blocked.test'
--- a/mysql-test/suite/perfschema/t/hostcache_ipv6_blocked.test 2012-01-30 19:03:41 +0000
+++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_blocked.test 2012-02-01 17:24:09 +0000
@@ -19,7 +19,6 @@ flush user_resources;
select @@global.debug;
select @@global.max_connect_errors;
select @@global.max_connect_errors into @saved_max_connect_errors;
-show global status like "%peer%";
set global max_connect_errors = 2;
=== modified file 'mysql-test/suite/perfschema/t/hostcache_ipv6_max_con.test'
--- a/mysql-test/suite/perfschema/t/hostcache_ipv6_max_con.test 2012-01-30 10:39:47 +0000
+++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_max_con.test 2012-02-01 17:24:09 +0000
@@ -24,7 +24,6 @@ select @@global.debug;
select @@global.max_user_connections;
select @@global.max_connections;
select @@global.max_connections into @saved_max_connections;
-show global status like "%peer%";
create user 'quota'@'santa.claus.ipv6.example.com';
grant select on test.* to 'quota'@'santa.claus.ipv6.example.com';
=== modified file 'mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_again_allow.test'
--- a/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_again_allow.test 2012-01-30 10:39:47 +0000
+++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_again_allow.test 2012-02-01 17:24:09 +0000
@@ -18,7 +18,6 @@ call mtr.add_suppression("2001:db8::6:6"
flush status;
flush hosts;
select @@global.debug;
-show global status like "%peer%";
grant select on test.* to 'root'@'2001:db8::6:6';
grant select on test.* to 'root'@'santa.claus.ipv6.example.com';
=== modified file 'mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_again_deny.test'
--- a/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_again_deny.test 2012-01-27 12:14:54 +0000
+++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_again_deny.test 2012-02-01 17:24:09 +0000
@@ -18,7 +18,6 @@ call mtr.add_suppression("2001:db8::6:6"
flush status;
flush hosts;
select @@global.debug;
-show global status like "%peer%";
connect (con1,"::1",root,,test,$MASTER_MYPORT,);
select "Con1 is alive";
=== modified file 'mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_noname_allow.test'
--- a/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_noname_allow.test 2012-01-30 10:39:47 +0000
+++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_noname_allow.test 2012-02-01 17:24:09 +0000
@@ -18,7 +18,6 @@ call mtr.add_suppression("2001:db8::6:6"
flush status;
flush hosts;
select @@global.debug;
-show global status like "%peer%";
grant select on test.* to 'root'@'2001:db8::6:6';
=== modified file 'mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_noname_deny.test'
--- a/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_noname_deny.test 2012-01-27 12:14:54 +0000
+++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_noname_deny.test 2012-02-01 17:24:09 +0000
@@ -18,7 +18,6 @@ call mtr.add_suppression("2001:db8::6:6"
flush status;
flush hosts;
select @@global.debug;
-show global status like "%peer%";
connect (con1,"::1",root,,test,$MASTER_MYPORT,);
select "Con1 is alive";
=== modified file 'mysql-test/suite/perfschema/t/hostcache_peer_addr.test'
--- a/mysql-test/suite/perfschema/t/hostcache_peer_addr.test 2012-01-27 12:14:54 +0000
+++ b/mysql-test/suite/perfschema/t/hostcache_peer_addr.test 2012-02-01 17:24:09 +0000
@@ -12,7 +12,7 @@
flush status;
flush hosts;
select @@global.debug;
-show global status like "%peer%";
+show global status like "connection_%_errors";
connect (con1,"127.0.0.1",root,,test,$MASTER_MYPORT,);
select "Con1 is alive";
@@ -28,7 +28,7 @@ connect (con2,"127.0.0.1",root,,test,$MA
--enable_query_log
--connection default
-show global status like "%peer%";
+show global status like "connection_%_errors";
--source ../include/hostcache_dump.inc
--disable_query_log
@@ -37,11 +37,11 @@ connect (con3,"127.0.0.1",root,,test,$MA
--enable_query_log
--connection default
-show global status like "%peer%";
+show global status like "connection_%_errors";
--source ../include/hostcache_dump.inc
set global debug= default;
flush status;
-show global status like "%peer%";
+show global status like "connection_%_errors";
=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc 2012-01-30 10:59:40 +0000
+++ b/sql/mysqld.cc 2012-02-01 17:24:09 +0000
@@ -602,8 +602,18 @@ const char *in_additional_cond= "<IN CON
const char *in_having_cond= "<IN HAVING>";
my_decimal decimal_zero;
+/** Number of connection errors when selecting on the listening port */
+ulong connection_select_errors= 0;
+/** Number of connection errors when accepting sockets in the listening port. */
+ulong connection_accept_errors= 0;
+/** Number of connection errors from TCP wrappers. */
+ulong connection_tcpwrap_errors= 0;
+/** Number of connection errors from internal server errors. */
+ulong connection_internal_errors= 0;
+/** Number of connection errors from the server max_connection limit. */
+ulong connection_max_connection_errors= 0;
/** Number of errors when reading the peer address. */
-ulong peer_addr_errors= 0;
+ulong connection_peer_addr_errors= 0;
/* classes for comparation parsing/processing */
Eq_creator eq_creator;
@@ -3217,7 +3227,12 @@ int init_common_variables()
{
char buff[FN_REFLEN];
umask(((~my_umask) & 0666));
- peer_addr_errors= 0;
+ connection_select_errors= 0;
+ connection_accept_errors= 0;
+ connection_tcpwrap_errors= 0;
+ connection_internal_errors= 0;
+ connection_max_connection_errors= 0;
+ connection_peer_addr_errors= 0;
my_decimal_set_zero(&decimal_zero); // set decimal_zero constant;
tzset(); // Set tzname
@@ -5399,6 +5414,7 @@ void create_thread_to_handle_connection(
mysql_mutex_lock(&LOCK_thread_count);
delete thd;
mysql_mutex_unlock(&LOCK_thread_count);
+ connection_internal_errors++;
return;
/* purecov: end */
}
@@ -5439,6 +5455,7 @@ static void create_new_thread(THD *thd)
DBUG_PRINT("error",("Too many connections"));
close_connection(thd, ER_CON_COUNT_ERROR);
delete thd;
+ connection_max_connection_errors++;
DBUG_VOID_RETURN;
}
@@ -5563,6 +5580,12 @@ void handle_connections_sockets()
{
if (socket_errno != SOCKET_EINTR)
{
+ /*
+ select(2)/poll(2) failed on the listening port.
+ There is not much details to report about the client,
+ increment the server global status variable.
+ */
+ connection_select_errors++;
if (!select_errors++ && !abort_loop) /* purecov: inspected */
sql_print_error("mysqld: Got error %d from select",socket_errno); /* purecov: inspected */
}
@@ -5639,6 +5662,12 @@ void handle_connections_sockets()
#endif
if (mysql_socket_getfd(new_sock) == INVALID_SOCKET)
{
+ /*
+ accept(2) failed on the listening port, after many retries.
+ There is not much details to report about the client,
+ increment the server global status variable.
+ */
+ connection_accept_errors++;
if ((error_count++ & 255) == 0) // This can happen often
sql_perror("Error in accept");
MAYBE_BROKEN_SYSCALL;
@@ -5656,47 +5685,38 @@ void handle_connections_sockets()
request_init(&req, RQ_DAEMON, libwrapName, RQ_FILE, mysql_socket_getfd(new_sock), NULL);
my_fromhost(&req);
- if (!my_hosts_access(&req))
- {
- /*
- This may be stupid but refuse() includes an exit(0)
- which we surely don't want...
- clean_exit() - same stupid thing ...
- */
- syslog(deny_severity, "refused connect from %s",
- my_eval_client(&req));
-
- /*
- C++ sucks (the gibberish in front just translates the supplied
- sink function pointer in the req structure from a void (*sink)();
- to a void(*sink)(int) if you omit the cast, the C++ compiler
- will cry...
- */
- if (req.sink)
- ((void (*)(int))req.sink)(req.fd);
-
- (void) mysql_socket_shutdown(new_sock, SHUT_RDWR);
- (void) mysql_socket_close(new_sock);
+ if (!my_hosts_access(&req))
+ {
+ /*
+ This may be stupid but refuse() includes an exit(0)
+ which we surely don't want...
+ clean_exit() - same stupid thing ...
+ */
+ syslog(deny_severity, "refused connect from %s",
+ my_eval_client(&req));
+
+ /*
+ C++ sucks (the gibberish in front just translates the supplied
+ sink function pointer in the req structure from a void (*sink)();
+ to a void(*sink)(int) if you omit the cast, the C++ compiler
+ will cry...
+ */
+ if (req.sink)
+ ((void (*)(int))req.sink)(req.fd);
+
+ mysql_socket_shutdown(new_sock, SHUT_RDWR);
+ mysql_socket_close(new_sock);
+ /*
+ The connection was refused by TCP wrappers.
+ There are no details (by client IP) available to update the host_cache.
+ */
+ connection_tcpwrap_errors++;
continue;
}
}
}
#endif /* HAVE_LIBWRAP */
- {
- size_socket dummyLen;
- struct sockaddr_storage dummy;
- dummyLen = sizeof(dummy);
- if ( mysql_socket_getsockname(new_sock, (struct sockaddr *)&dummy,
- (SOCKET_SIZE_TYPE *)&dummyLen) < 0 )
- {
- sql_perror("Error on new connection socket");
- (void) mysql_socket_shutdown(new_sock, SHUT_RDWR);
- (void) mysql_socket_close(new_sock);
- continue;
- }
- }
-
/*
** Don't allow too many connections
*/
@@ -5705,6 +5725,7 @@ void handle_connections_sockets()
{
(void) mysql_socket_shutdown(new_sock, SHUT_RDWR);
(void) mysql_socket_close(new_sock);
+ connection_internal_errors++;
continue;
}
@@ -5729,6 +5750,7 @@ void handle_connections_sockets()
(void) mysql_socket_close(new_sock);
}
delete thd;
+ connection_internal_errors++;
continue;
}
init_net_server_extension(thd);
@@ -7008,6 +7030,12 @@ SHOW_VAR status_vars[]= {
{"Com", (char*) com_status_vars, SHOW_ARRAY},
{"Compression", (char*) &show_net_compression, SHOW_FUNC},
{"Connections", (char*) &thread_id, SHOW_LONG_NOFLUSH},
+ {"Connection_accept_errors", (char*) &connection_accept_errors, SHOW_LONG},
+ {"Connection_internal_errors", (char*) &connection_internal_errors, SHOW_LONG},
+ {"Connection_max_connection_errors", (char*) &connection_max_connection_errors, SHOW_LONG},
+ {"Connection_peer_address_errors", (char*) &connection_peer_addr_errors, SHOW_LONG},
+ {"Connection_select_errors", (char*) &connection_select_errors, SHOW_LONG},
+ {"Connection_tcpwrap_errors", (char*) &connection_tcpwrap_errors, SHOW_LONG},
{"Created_tmp_disk_tables", (char*) offsetof(STATUS_VAR, created_tmp_disk_tables), SHOW_LONGLONG_STATUS},
{"Created_tmp_files", (char*) &my_tmp_file_created, SHOW_LONG},
{"Created_tmp_tables", (char*) offsetof(STATUS_VAR, created_tmp_tables), SHOW_LONGLONG_STATUS},
@@ -7050,7 +7078,6 @@ SHOW_VAR status_vars[]= {
{"Opened_files", (char*) &my_file_total_opened, SHOW_LONG_NOFLUSH},
{"Opened_tables", (char*) offsetof(STATUS_VAR, opened_tables), SHOW_LONGLONG_STATUS},
{"Opened_table_definitions", (char*) offsetof(STATUS_VAR, opened_shares), SHOW_LONGLONG_STATUS},
- {"Peer_address_errors", (char*) &peer_addr_errors, SHOW_LONG},
{"Prepared_stmt_count", (char*) &show_prepared_stmt_count, SHOW_FUNC},
#ifdef HAVE_QUERY_CACHE
{"Qcache_free_blocks", (char*) &query_cache.free_memory_blocks, SHOW_LONG_NOFLUSH},
=== modified file 'sql/mysqld.h'
--- a/sql/mysqld.h 2012-01-26 10:20:10 +0000
+++ b/sql/mysqld.h 2012-02-01 17:24:09 +0000
@@ -237,7 +237,12 @@ extern I_List<THD> threads;
extern char err_shared_dir[];
extern TYPELIB thread_handling_typelib;
extern my_decimal decimal_zero;
-extern ulong peer_addr_errors;
+extern ulong connection_select_errors;
+extern ulong connection_accept_errors;
+extern ulong connection_tcpwrap_errors;
+extern ulong connection_internal_errors;
+extern ulong connection_max_connection_errors;
+extern ulong connection_peer_addr_errors;
extern ulong log_warnings;
/*
=== modified file 'sql/sql_connect.cc'
--- a/sql/sql_connect.cc 2012-01-30 19:03:41 +0000
+++ b/sql/sql_connect.cc 2012-02-01 17:24:09 +0000
@@ -443,7 +443,10 @@ bool init_new_connection_handler_thread(
{
pthread_detach_this_thread();
if (my_thread_init())
+ {
+ connection_internal_errors++;
return 1;
+ }
return 0;
}
@@ -548,13 +551,18 @@ static int check_connection(THD *thd)
there is nothing to show in the host_cache,
so increment the global status variable "peer_address_errors".
*/
- statistic_increment(peer_addr_errors, &LOCK_status);
+ statistic_increment(connection_peer_addr_errors, &LOCK_status);
my_error(ER_BAD_HOST_ERROR, MYF(0));
return 1;
}
if (!(thd->main_security_ctx.ip= my_strdup(ip,MYF(MY_WME))))
{
- /* FIXME: no error accounting in host_cache. */
+ /*
+ No error accounting per IP in host_cache,
+ this is treated as a global server OOM error.
+ TODO: remove the need for my_strdup.
+ */
+ connection_internal_errors++;
return 1; /* The error is set by my_strdup(). */
}
thd->main_security_ctx.host_or_ip= thd->main_security_ctx.ip;
@@ -608,7 +616,18 @@ static int check_connection(THD *thd)
if (thd->packet.alloc(thd->variables.net_buffer_length))
{
- /* FIXME: no error accounting in host_cache. */
+ /*
+ Important note:
+ net_buffer_length is a SESSION variable,
+ so it may be tempting to account OOM conditions per IP in the HOST_CACHE,
+ in case some clients are more demanding than others ...
+ However, this session variable is *not* initialized with a per client
+ value during the initial connection, it is initialized from the
+ GLOBAL net_buffer_length variable from the server.
+ Hence, there is no reason to account on OOM conditions per client IP,
+ we count failures in the global server status instead.
+ */
+ connection_internal_errors++;
return 1; /* The error is set by alloc(). */
}
No bundle (reason: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-trunk-wl5259 branch (marc.alff:3366 to 3367) | Marc Alff | 2 Feb |
