From: Marc Alff Date: August 17 2011 8:30pm Subject: bzr push into mysql-trunk branch (marc.alff:3371 to 3372) List-Archive: http://lists.mysql.com/commits/140687 Message-Id: <201108172030.p7HKUMix020020@acsmt358.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3372 Marc Alff 2011-08-17 Misc cleanup modified: mysql-test/include/mtr_check.sql mysql-test/suite/perfschema/r/socket_instances_func_win.result* mysql-test/suite/perfschema/t/disabled.def* mysql-test/suite/perfschema/t/socket_connect.test mysql-test/suite/perfschema/t/socket_instances_func-master.opt* mysql-test/suite/perfschema/t/socket_instances_func.test* mysql-test/suite/perfschema/t/socket_instances_func_win-master.opt* mysql-test/suite/perfschema/t/socket_instances_func_win.test* mysql-test/suite/perfschema/t/socket_summary_by_instance_func.test* mysql-test/suite/perfschema/t/socket_summary_by_instance_func_dbg.test* storage/perfschema/CMakeLists.txt* storage/perfschema/pfs.cc* storage/perfschema/table_socket_instances.cc 3371 Christopher Powers 2011-08-16 WL#4896 "Performance Schema Net IO" Added socket_connect.test to verify handling of TCP/IP clients in the socket instance tables added: mysql-test/suite/perfschema/include/socket_ipv6.inc mysql-test/suite/perfschema/r/socket_connect.result mysql-test/suite/perfschema/t/socket_connect.test === modified file 'mysql-test/include/mtr_check.sql' --- a/mysql-test/include/mtr_check.sql 2011-07-04 07:53:26 +0000 +++ b/mysql-test/include/mtr_check.sql 2011-08-17 20:29:21 +0000 @@ -19,32 +19,28 @@ use mtr|| CREATE DEFINER=root@localhost PROCEDURE check_testcase_perfschema() BEGIN - -- For tests tampering with performance_schema table structure - DECLARE CONTINUE HANDLER for SQLEXCEPTION BEGIN + -- For tests tampering with performance_schema table structure + DECLARE CONTINUE HANDLER for SQLEXCEPTION + BEGIN + END; + + -- Leave the instruments in the same state + SELECT * from performance_schema.setup_instruments + where enabled='NO' order by NAME; END; - -- Leave the instruments in the same state - SELECT * from performance_schema.SETUP_INSTRUMENTS - where enabled='NO' order by NAME; - -- Leave the consumers in the same state - SELECT * from performance_schema.SETUP_CONSUMERS + SELECT * from performance_schema.setup_consumers order by NAME; -- Leave the actors setup in the same state - SELECT * from performance_schema.SETUP_ACTORS + SELECT * from performance_schema.setup_actors order by USER, HOST; -- Leave the objects setup in the same state - SELECT * from performance_schema.SETUP_OBJECTS - order by OBJECT_TYPE, OBJECT_SCHEMA, OBJECT_NAME; - - -- Leave the core objects in the same state - SELECT * from performance_schema.OBJECTS - where enabled='YES' and OBJECT_SCHEMA in ('performance_schema', 'mysql') + SELECT * from performance_schema.setup_objects order by OBJECT_TYPE, OBJECT_SCHEMA, OBJECT_NAME; - END|| -- === modified file 'mysql-test/suite/perfschema/r/socket_instances_func_win.result' (properties changed: +x to -x) === modified file 'mysql-test/suite/perfschema/t/disabled.def' (properties changed: +x to -x) === modified file 'mysql-test/suite/perfschema/t/socket_connect.test' --- a/mysql-test/suite/perfschema/t/socket_connect.test 2011-08-17 02:23:39 +0000 +++ b/mysql-test/suite/perfschema/t/socket_connect.test 2011-08-17 20:29:21 +0000 @@ -1,4 +1,4 @@ -# Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -21,6 +21,8 @@ #============================================================================== --source include/not_embedded.inc +--source include/have_perfschema.inc +--source ../include/wait_for_pfs_thread_count.inc # Set this to enable debugging output let $my_socket_debug=0; === modified file 'mysql-test/suite/perfschema/t/socket_instances_func-master.opt' (properties changed: +x to -x) === modified file 'mysql-test/suite/perfschema/t/socket_instances_func.test' (properties changed: +x to -x) === modified file 'mysql-test/suite/perfschema/t/socket_instances_func_win-master.opt' (properties changed: +x to -x) === modified file 'mysql-test/suite/perfschema/t/socket_instances_func_win.test' (properties changed: +x to -x) === modified file 'mysql-test/suite/perfschema/t/socket_summary_by_instance_func.test' (properties changed: +x to -x) === modified file 'mysql-test/suite/perfschema/t/socket_summary_by_instance_func_dbg.test' (properties changed: +x to -x) === modified file 'storage/perfschema/CMakeLists.txt' (properties changed: +x to -x) === modified file 'storage/perfschema/pfs.cc' (properties changed: +x to -x) === modified file 'storage/perfschema/table_socket_instances.cc' --- a/storage/perfschema/table_socket_instances.cc 2011-04-01 22:04:26 +0000 +++ b/storage/perfschema/table_socket_instances.cc 2011-08-17 20:29:21 +0000 @@ -169,6 +169,9 @@ void table_socket_instances::make_row(PF m_row.m_thread_id= safe_thread->m_thread_internal_id; m_row.m_thread_id_set= true; } + else + m_row.m_thread_id_set= false; + if (pfs->m_lock.end_optimistic_lock(&lock)) m_row_exists= true; No bundle (reason: useless for push emails).