From: Marc Alff Date: January 18 2012 10:26am Subject: bzr push into mysql-trunk-wl5259 branch (marc.alff:3352 to 3353) List-Archive: http://lists.mysql.com/commits/142480 Message-Id: <201201181026.q0IAQhNr005106@acsmt357.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3353 Marc Alff 2012-01-18 Fixed test cases for IPv6 added: mysql-test/include/have_ipv6.inc mysql-test/suite/sys_vars/r/host_cache_size_basic.result mysql-test/suite/sys_vars/t/host_cache_size_basic-master.opt mysql-test/suite/sys_vars/t/host_cache_size_basic.test modified: mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_again_deny.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_deny.test mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_again_deny.test mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_noname_deny.test sql/sys_vars.cc 3352 Marc Alff 2012-01-17 [merge] Merge mysql-trunk --> mysql-trunk-wl5259 modified: mysql-test/include/subquery_mat.inc mysql-test/include/subquery_sj.inc mysql-test/r/group_by.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/r/user_var.result mysql-test/t/group_by.test mysql-test/t/user_var.test sql/item_func.h sql/item_subselect.cc sql/sql_base.cc sql/sql_executor.cc sql/sql_optimizer.cc sql/sql_planner.cc sql/sql_select.h === added file 'mysql-test/include/have_ipv6.inc' --- a/mysql-test/include/have_ipv6.inc 1970-01-01 00:00:00 +0000 +++ b/mysql-test/include/have_ipv6.inc 2012-01-18 10:25:19 +0000 @@ -0,0 +1,20 @@ +# Check if ipv6 is available. +# +--disable_query_log +--disable_result_log +--disable_abort_on_error +connect (checkcon123456789,::1,root,,test); +if($mysql_errno) +{ + skip No IPv6 support; +} +connection default; +if(!$mysql_errno) +{ + disconnect checkcon123456789; +} +--enable_abort_on_error +--enable_result_log +--enable_query_log +# end check + === 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-17 08:31:24 +0000 +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_again_deny.test 2012-01-18 10:25:19 +0000 @@ -17,6 +17,7 @@ --source include/not_embedded.inc --source include/have_debug.inc +--source include/have_ipv6.inc --source include/have_perfschema.inc # [Warning] Host name 'santa.claus.ipv6.example.com' could not be resolved: === 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-17 08:31:24 +0000 +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_bad_deny.test 2012-01-18 10:25:19 +0000 @@ -28,6 +28,7 @@ --source include/not_embedded.inc --source include/have_debug.inc +--source include/have_ipv6.inc --source include/have_perfschema.inc # [Warning] Hostname 'santa.claus.ipv6.example.com' does not resolve to '2001:db8::6:6'. === 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-17 08:31:24 +0000 +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_good_allow.test 2012-01-18 10:25:19 +0000 @@ -17,6 +17,7 @@ --source include/not_embedded.inc --source include/have_debug.inc +--source include/have_ipv6.inc --source include/have_perfschema.inc # [Warning] IP address '192.0.2.4' could not be resolved: === 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-17 08:31:24 +0000 +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_good_deny.test 2012-01-18 10:25:19 +0000 @@ -17,6 +17,7 @@ --source include/not_embedded.inc --source include/have_debug.inc +--source include/have_ipv6.inc --source include/have_perfschema.inc flush status; === 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-17 13:48:50 +0000 +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_noname_deny.test 2012-01-18 10:25:19 +0000 @@ -17,6 +17,7 @@ --source include/not_embedded.inc --source include/have_debug.inc +--source include/have_ipv6.inc --source include/have_perfschema.inc # [Warning] Host name 'santa.claus.ipv6.example.com' could not be resolved: === 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-17 08:31:24 +0000 +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_again_deny.test 2012-01-18 10:25:19 +0000 @@ -49,6 +49,7 @@ --source include/not_embedded.inc --source include/have_debug.inc +--source include/have_ipv6.inc --source include/have_perfschema.inc # [Warning] IP address '2001:db8::6:6' could not be resolved: === 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-17 08:31:24 +0000 +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_noname_deny.test 2012-01-18 10:25:19 +0000 @@ -16,6 +16,7 @@ --source include/not_embedded.inc --source include/have_debug.inc +--source include/have_ipv6.inc --source include/have_perfschema.inc # [Warning] IP address '2001:db8::6:6' could not be resolved: === added file 'mysql-test/suite/sys_vars/r/host_cache_size_basic.result' --- a/mysql-test/suite/sys_vars/r/host_cache_size_basic.result 1970-01-01 00:00:00 +0000 +++ b/mysql-test/suite/sys_vars/r/host_cache_size_basic.result 2012-01-18 10:25:19 +0000 @@ -0,0 +1,37 @@ +select @@global.host_cache_size; +@@global.host_cache_size +123 +select @@session.host_cache_size; +ERROR HY000: Variable 'host_cache_size' is a GLOBAL variable +show global variables like 'host_cache_size'; +Variable_name Value +host_cache_size 123 +show session variables like 'host_cache_size'; +Variable_name Value +host_cache_size 123 +select * from information_schema.global_variables +where variable_name='host_cache_size'; +VARIABLE_NAME VARIABLE_VALUE +HOST_CACHE_SIZE 123 +select * from information_schema.session_variables +where variable_name='host_cache_size'; +VARIABLE_NAME VARIABLE_VALUE +HOST_CACHE_SIZE 123 +set global host_cache_size=1; +select @@global.host_cache_size; +@@global.host_cache_size +1 +set global host_cache_size=12; +select @@global.host_cache_size; +@@global.host_cache_size +12 +set global host_cache_size=0; +select @@global.host_cache_size; +@@global.host_cache_size +0 +set session host_cache_size=1; +ERROR HY000: Variable 'host_cache_size' is a GLOBAL variable and should be set with SET GLOBAL +set global host_cache_size=123; +select @@global.host_cache_size; +@@global.host_cache_size +123 === added file 'mysql-test/suite/sys_vars/t/host_cache_size_basic-master.opt' --- a/mysql-test/suite/sys_vars/t/host_cache_size_basic-master.opt 1970-01-01 00:00:00 +0000 +++ b/mysql-test/suite/sys_vars/t/host_cache_size_basic-master.opt 2012-01-18 10:25:19 +0000 @@ -0,0 +1 @@ +--host-cache-size=123 === added file 'mysql-test/suite/sys_vars/t/host_cache_size_basic.test' --- a/mysql-test/suite/sys_vars/t/host_cache_size_basic.test 1970-01-01 00:00:00 +0000 +++ b/mysql-test/suite/sys_vars/t/host_cache_size_basic.test 2012-01-18 10:25:19 +0000 @@ -0,0 +1,41 @@ +--source include/not_embedded.inc + +# +# Only global +# + +select @@global.host_cache_size; + +--error ER_INCORRECT_GLOBAL_LOCAL_VAR +select @@session.host_cache_size; + +show global variables like 'host_cache_size'; + +show session variables like 'host_cache_size'; + +select * from information_schema.global_variables + where variable_name='host_cache_size'; + +select * from information_schema.session_variables + where variable_name='host_cache_size'; + +# +# Read-Write +# + +set global host_cache_size=1; +select @@global.host_cache_size; + +set global host_cache_size=12; +select @@global.host_cache_size; + +set global host_cache_size=0; +select @@global.host_cache_size; + +--error ER_GLOBAL_VARIABLE +set session host_cache_size=1; + +# Restore default +set global host_cache_size=123; +select @@global.host_cache_size; + === modified file 'sql/sys_vars.cc' --- a/sql/sys_vars.cc 2012-01-02 10:37:56 +0000 +++ b/sql/sys_vars.cc 2012-01-18 10:25:19 +0000 @@ -3772,7 +3772,7 @@ static Sys_var_ulong Sys_host_cache_size "host_cache_size", "How many host names should be cached to avoid resolving.", GLOBAL_VAR(host_cache_size), - CMD_LINE(REQUIRED_ARG), VALID_RANGE(0, 2048), + CMD_LINE(REQUIRED_ARG), VALID_RANGE(0, 65536), DEFAULT(HOST_CACHE_SIZE), BLOCK_SIZE(1), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(NULL), No bundle (reason: useless for push emails).