From: Christopher Powers Date: July 21 2011 12:44am Subject: bzr push into mysql-trunk branch (chris.powers:3326 to 3327) WL#4896 List-Archive: http://lists.mysql.com/commits/140399 Message-Id: <201107210045.p6L0j2GU028569@acsmt358.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3327 Christopher Powers 2011-07-20 WL#4896 "Performance Schema Net IO" - Touch up socket_instances_func test case for Windows modified: mysql-test/suite/perfschema/r/socket_instances_func_win.result mysql-test/suite/perfschema/t/socket_instances_func_win.test 3326 Christopher Powers 2011-07-20 WL#4896 "Performance Schema Net IO" - Remove unnecessary debug asserts in set_socket() functions - Use 'sql' instead of 'com' category for socket keys and update socket_instances_func.test accordingly @ storage/perfschema/pfs.cc Remove unnecessary DBUG_ASSERTs modified: mysql-test/suite/perfschema/r/socket_instances_func.result mysql-test/suite/perfschema/t/socket_instances_func.test storage/perfschema/pfs.cc === modified file 'mysql-test/suite/perfschema/r/socket_instances_func_win.result' --- a/mysql-test/suite/perfschema/r/socket_instances_func_win.result 2011-07-15 00:50:02 +0000 +++ b/mysql-test/suite/perfschema/r/socket_instances_func_win.result 2011-07-21 00:43:18 +0000 @@ -62,7 +62,7 @@ WHERE PORT = @port; Expect 1 1 # Check the content for the default connection (tcpip) -SELECT EVENT_NAME = 'wait/io/socket/com/client_connection' +SELECT EVENT_NAME = 'wait/io/socket/sql/client_connection' AND IP = '127.0.0.1' AS 'Expect 1' FROM performance_schema.socket_instances WHERE THREAD_ID = @thread_id; @@ -70,26 +70,26 @@ Expect 1 1 # Characteristics of 'server_tcpip_socket' entry # Server listening socket, TCP/IP -# There is only one entry with 'wait/io/socket/com/server_tcpip_socket'. +# There is only one entry with 'wait/io/socket/sql/server_tcpip_socket'. SELECT COUNT(*) = 1 AS 'Expect 1' FROM performance_schema.socket_instances -WHERE EVENT_NAME = 'wait/io/socket/com/server_tcpip_socket'; +WHERE EVENT_NAME = 'wait/io/socket/sql/server_tcpip_socket'; Expect 1 1 # Get the 'server_tcpip_socket' thread id SELECT THREAD_ID INTO @thread_id FROM performance_schema.socket_instances -WHERE EVENT_NAME = 'wait/io/socket/com/server_tcpip_socket'; +WHERE EVENT_NAME = 'wait/io/socket/sql/server_tcpip_socket'; # Check the content. SELECT THREAD_ID = @thread_id AND PORT = AND IP = '0.0.0.0' AND STATE = 'ACTIVE' AS 'Expect 1' FROM performance_schema.socket_instances -WHERE EVENT_NAME = 'wait/io/socket/com/server_tcpip_socket'; +WHERE EVENT_NAME = 'wait/io/socket/sql/server_tcpip_socket'; Expect 1 1 # Check content for client connection 1 (tcpip) -SELECT EVENT_NAME = 'wait/io/socket/com/client_connection' +SELECT EVENT_NAME = 'wait/io/socket/sql/client_connection' AND IP = '127.0.0.1' AND PORT = @port AS 'Expect 1' @@ -105,7 +105,7 @@ WHERE THREAD_ID = @thread_id; Expect 1 1 # Check content for client connection 2 (tcpip) -SELECT EVENT_NAME = 'wait/io/socket/com/client_connection' +SELECT EVENT_NAME = 'wait/io/socket/sql/client_connection' AND IP = '127.0.0.1' AND PORT = @port AS 'Expect 1' @@ -128,8 +128,8 @@ NOT IN (SELECT EVENT_NAME,OBJECT_INSTANC FROM my_socket_instances) ORDER BY THREAD_ID; EVENT_NAME IP -wait/io/socket/com/client_connection 127.0.0.1 -wait/io/socket/com/client_connection 127.0.0.1 +wait/io/socket/sql/client_connection 127.0.0.1 +wait/io/socket/sql/client_connection 127.0.0.1 # Disconnect con1, con2 and con3 # Show differences to socket_instances before con1,con1 connecting. # There should be none. === modified file 'mysql-test/suite/perfschema/t/socket_instances_func_win.test' --- a/mysql-test/suite/perfschema/t/socket_instances_func_win.test 2011-07-15 00:50:02 +0000 +++ b/mysql-test/suite/perfschema/t/socket_instances_func_win.test 2011-07-21 00:43:18 +0000 @@ -158,13 +158,13 @@ WHERE PORT = @port; --echo # Check the content for the default connection (tcpip) # EVENT_NAME OBJECT_INSTANCE_BEGIN THREAD_ID SOCKET_ID IP PORT STATE -# wait/io/socket/com/client_connection 26139912 16 907296 127.0.0.1 2631 ACTIVE +# wait/io/socket/sql/client_connection 26139912 16 907296 127.0.0.1 2631 ACTIVE --disable_query_log eval set @thread_id = $con0_thread_id; --enable_query_log -SELECT EVENT_NAME = 'wait/io/socket/com/client_connection' +SELECT EVENT_NAME = 'wait/io/socket/sql/client_connection' AND IP = '127.0.0.1' AS 'Expect 1' FROM performance_schema.socket_instances WHERE THREAD_ID = @thread_id; @@ -175,18 +175,18 @@ WHERE THREAD_ID = @thread_id; --echo # Characteristics of 'server_tcpip_socket' entry --echo # Server listening socket, TCP/IP ---echo # There is only one entry with 'wait/io/socket/com/server_tcpip_socket'. +--echo # There is only one entry with 'wait/io/socket/sql/server_tcpip_socket'. SELECT COUNT(*) = 1 AS 'Expect 1' FROM performance_schema.socket_instances -WHERE EVENT_NAME = 'wait/io/socket/com/server_tcpip_socket'; +WHERE EVENT_NAME = 'wait/io/socket/sql/server_tcpip_socket'; # Store the thread id of server_tcpip_socket --echo # Get the 'server_tcpip_socket' thread id SELECT THREAD_ID INTO @thread_id FROM performance_schema.socket_instances -WHERE EVENT_NAME = 'wait/io/socket/com/server_tcpip_socket'; +WHERE EVENT_NAME = 'wait/io/socket/sql/server_tcpip_socket'; let $server_tcpip_thread_id= `SELECT @thread_id`; @@ -197,14 +197,14 @@ eval SELECT THREAD_ID = @thread_id AND PORT = $MASTER_MYPORT AND IP = '0.0.0.0' AND STATE = 'ACTIVE' AS 'Expect 1' FROM performance_schema.socket_instances -WHERE EVENT_NAME = 'wait/io/socket/com/server_tcpip_socket'; +WHERE EVENT_NAME = 'wait/io/socket/sql/server_tcpip_socket'; # # VERIFY TCP/IP CLIENT CONNECTION 1 # # EVENT_NAME OBJECT_INSTANCE_BEGIN THREAD_ID SOCKET_ID IP PORT STATE -# wait/io/socket/com/client_connection 140707865187120 18 59 127.0.0.1 59298 IDLE or ACTIVE +# wait/io/socket/sql/client_connection 140707865187120 18 59 127.0.0.1 59298 IDLE or ACTIVE --echo # Check content for client connection 1 (tcpip) @@ -213,7 +213,7 @@ eval set @port = $con1_port; eval set @thread_id = $con1_thread_id; --enable_query_log -eval SELECT EVENT_NAME = 'wait/io/socket/com/client_connection' +eval SELECT EVENT_NAME = 'wait/io/socket/sql/client_connection' AND IP = '127.0.0.1' AND PORT = @port AS 'Expect 1' @@ -232,7 +232,7 @@ WHERE THREAD_ID = @thread_id; # # EVENT_NAME OBJECT_INSTANCE_BEGIN THREAD_ID SOCKET_ID IP PORT STATE -# wait/io/socket/com/client_connection 140707865187120 18 59 127.0.0.1 59298 IDLE or ACTIVE +# wait/io/socket/sql/client_connection 140707865187120 18 59 127.0.0.1 59298 IDLE or ACTIVE --echo # Check content for client connection 2 (tcpip) @@ -241,7 +241,7 @@ eval set @port = $con2_port; eval set @thread_id = $con2_thread_id; --enable_query_log -eval SELECT EVENT_NAME = 'wait/io/socket/com/client_connection' +eval SELECT EVENT_NAME = 'wait/io/socket/sql/client_connection' AND IP = '127.0.0.1' AND PORT = @port AS 'Expect 1' @@ -297,4 +297,3 @@ NOT IN (SELECT EVENT_NAME,OBJECT_INSTANC FROM my_socket_instances) ORDER BY THREAD_ID; - No bundle (reason: useless for push emails).