From: Marc Alff Date: August 3 2011 5:34pm Subject: bzr push into mysql-trunk-wl5259 branch (marc.alff:3333 to 3334) List-Archive: http://lists.mysql.com/commits/140531 Message-Id: <201108031734.p73HY7EU004470@acsmt356.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3334 Marc Alff 2011-08-03 Misc cleanup modified: mysql-test/r/mysqld--help-notwin.result mysql-test/r/mysqld--help-win.result sql/mysqld.cc sql/sql_connect.cc 3333 Marc Alff 2011-08-02 WL#5259 PERFORMANCE SCHEMA HOST_CACHE Work in progress added: storage/perfschema/table_host_cache.cc storage/perfschema/table_host_cache.h modified: mysql-test/suite/perfschema/include/schema.inc mysql-test/suite/perfschema/include/start_server_common.inc mysql-test/suite/perfschema/r/information_schema.result mysql-test/suite/perfschema/r/pfs_upgrade.result mysql-test/suite/perfschema/r/schema.result mysql-test/suite/perfschema/r/start_server_innodb.result mysql-test/suite/perfschema/r/start_server_no_cond_class.result mysql-test/suite/perfschema/r/start_server_no_cond_inst.result mysql-test/suite/perfschema/r/start_server_no_file_class.result mysql-test/suite/perfschema/r/start_server_no_file_inst.result mysql-test/suite/perfschema/r/start_server_no_mutex_class.result mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result mysql-test/suite/perfschema/r/start_server_no_setup_actors.result mysql-test/suite/perfschema/r/start_server_no_setup_objects.result mysql-test/suite/perfschema/r/start_server_no_stage_class.result mysql-test/suite/perfschema/r/start_server_no_stages_history.result mysql-test/suite/perfschema/r/start_server_no_stages_history_long.result mysql-test/suite/perfschema/r/start_server_no_statement_class.result mysql-test/suite/perfschema/r/start_server_no_statements_history.result mysql-test/suite/perfschema/r/start_server_no_statements_history_long.result mysql-test/suite/perfschema/r/start_server_no_table_hdl.result mysql-test/suite/perfschema/r/start_server_no_table_inst.result mysql-test/suite/perfschema/r/start_server_no_thread_class.result mysql-test/suite/perfschema/r/start_server_no_thread_inst.result mysql-test/suite/perfschema/r/start_server_nothing.result mysql-test/suite/perfschema/r/start_server_off.result mysql-test/suite/perfschema/r/start_server_on.result mysql-test/suite/perfschema/r/table_schema.result scripts/mysql_system_tables.sql sql/hash_filo.h sql/hostname.cc sql/hostname.h sql/mysqld.cc sql/mysqld.h sql/sql_acl.cc sql/sql_connect.cc sql/sys_vars.cc storage/perfschema/CMakeLists.txt storage/perfschema/pfs_engine_table.cc === modified file 'mysql-test/r/mysqld--help-notwin.result' --- a/mysql-test/r/mysqld--help-notwin.result 2011-07-25 15:13:06 +0000 +++ b/mysql-test/r/mysqld--help-notwin.result 2011-08-03 17:33:10 +0000 @@ -190,6 +190,7 @@ The following options may be given as th The maximum length of the result of function GROUP_CONCAT() -?, --help Display this help and exit. + --host-cache-size=# How many host names should be cached to avoid resolving. --ignore-builtin-innodb Disable initialization of builtin InnoDB plugin --init-connect=name Command(s) that are executed for each new connection @@ -833,6 +834,7 @@ gdb FALSE general-log FALSE group-concat-max-len 1024 help TRUE +host-cache-size 128 ignore-builtin-innodb FALSE init-connect init-file (No default value) === modified file 'mysql-test/r/mysqld--help-win.result' --- a/mysql-test/r/mysqld--help-win.result 2011-07-25 15:13:06 +0000 +++ b/mysql-test/r/mysqld--help-win.result 2011-08-03 17:33:10 +0000 @@ -190,6 +190,7 @@ The following options may be given as th The maximum length of the result of function GROUP_CONCAT() -?, --help Display this help and exit. + --host-cache-size=# How many host names should be cached to avoid resolving. --ignore-builtin-innodb Disable initialization of builtin InnoDB plugin --init-connect=name Command(s) that are executed for each new connection @@ -837,6 +838,7 @@ gdb FALSE general-log FALSE group-concat-max-len 1024 help TRUE +host-cache-size 128 ignore-builtin-innodb FALSE init-connect init-file (No default value) === modified file 'sql/mysqld.cc' --- a/sql/mysqld.cc 2011-08-02 17:17:18 +0000 +++ b/sql/mysqld.cc 2011-08-03 17:33:10 +0000 @@ -7014,7 +7014,7 @@ SHOW_VAR status_vars[]= { {"Opened_files", (char*) &my_file_total_opened, SHOW_LONG_NOFLUSH}, {"Opened_tables", (char*) offsetof(STATUS_VAR, opened_tables), SHOW_LONG_STATUS}, {"Opened_table_definitions", (char*) offsetof(STATUS_VAR, opened_shares), SHOW_LONG_STATUS}, - {"Peer_address_errors", (char*) &peer_addr_errors, SHOW_LONG_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/sql_connect.cc' --- a/sql/sql_connect.cc 2011-08-02 17:17:18 +0000 +++ b/sql/sql_connect.cc 2011-08-03 17:33:10 +0000 @@ -469,7 +469,7 @@ static int check_connection(THD *thd) there is nothing to show in the host_cache, so increment the global status variable "peer_address_errors". */ - peer_addr_errors++; + statistic_increment(peer_addr_errors, &LOCK_status); my_error(ER_BAD_HOST_ERROR, MYF(0)); return 1; } No bundle (reason: useless for push emails).