List:Commits« Previous MessageNext Message »
From:Christopher Powers Date:July 25 2011 7:02pm
Subject:bzr push into mysql-trunk branch (chris.powers:3334 to 3335) WL#4896
View as plain text  
 3335 Christopher Powers	2011-07-25
      WL#4896 "Performance Schema Net IO"
      
      PB debugging IPV6

    modified:
      mysql-test/suite/perfschema/r/socket_instances_func.result
      mysql-test/suite/perfschema/t/socket_instances_func.test
 3334 Christopher Powers	2011-07-25
      WL#4896 "Peformance Schema Net IO"
      
      Debugging PB failures -- disable other regression suites for debugging

    modified:
      mysql-test/suite/binlog/t/disabled.def
      mysql-test/suite/engines/funcs/t/disabled.def
      mysql-test/suite/federated/disabled.def
      mysql-test/suite/funcs_1/t/disabled.def
      mysql-test/suite/innodb/t/disabled.def
      mysql-test/suite/jp/t/disabled.def
      mysql-test/suite/parts/t/disabled.def
      mysql-test/suite/perfschema/t/disabled.def
      mysql-test/suite/rpl/t/disabled.def
      mysql-test/suite/sys_vars/t/disabled.def
      mysql-test/t/disabled.def
=== modified file 'mysql-test/suite/perfschema/r/socket_instances_func.result'
--- a/mysql-test/suite/perfschema/r/socket_instances_func.result	2011-07-25 17:25:43 +0000
+++ b/mysql-test/suite/perfschema/r/socket_instances_func.result	2011-07-25 19:01:56 +0000
@@ -40,24 +40,24 @@ SELECT * FROM performance_schema.socket_
 # DEBUG 1
 SELECT * FROM performance_schema.socket_instances;
 EVENT_NAME	OBJECT_INSTANCE_BEGIN	THREAD_ID	SOCKET_ID	IP	PORT	STATE
-wait/io/socket/sql/server_unix_socket	140087488855440	1	14		0	ACTIVE
-wait/io/socket/sql/server_tcpip_socket	140087488891504	1	13	0.0.0.0	13000	ACTIVE
-wait/io/socket/sql/client_connection	140087488908752	16	37		0	ACTIVE
+wait/io/socket/sql/client_connection	140629467156176	16	37		0	ACTIVE
+wait/io/socket/sql/server_unix_socket	140629467186192	1	14		0	ACTIVE
+wait/io/socket/sql/server_tcpip_socket	140629467267056	1	13	0.0.0.0	13000	ACTIVE
 current_user()
 root@localhost
 user()
 root@localhost
 EVENT_NAME	OBJECT_INSTANCE_BEGIN	THREAD_ID	SOCKET_ID	IP	PORT	STATE
-wait/io/socket/sql/server_unix_socket	140087488855440	1	14		0	ACTIVE
-wait/io/socket/sql/server_tcpip_socket	140087488891504	1	13	0.0.0.0	13000	ACTIVE
-wait/io/socket/sql/client_connection	140087488899568	17	60	127.0.0.1	46650	ACTIVE
-wait/io/socket/sql/client_connection	140087488908752	16	37		0	ACTIVE
+wait/io/socket/sql/client_connection	140629467156176	16	37		0	ACTIVE
+wait/io/socket/sql/server_unix_socket	140629467186192	1	14		0	ACTIVE
+wait/io/socket/sql/client_connection	140629467265264	17	60	127.0.0.1	38473	ACTIVE
+wait/io/socket/sql/server_tcpip_socket	140629467267056	1	13	0.0.0.0	13000	ACTIVE
 # DEBUG 1a
 SELECT * FROM performance_schema.socket_instances;
 EVENT_NAME	OBJECT_INSTANCE_BEGIN	THREAD_ID	SOCKET_ID	IP	PORT	STATE
-wait/io/socket/sql/server_unix_socket	140087488855440	1	14		0	ACTIVE
-wait/io/socket/sql/server_tcpip_socket	140087488891504	1	13	0.0.0.0	13000	ACTIVE
-wait/io/socket/sql/client_connection	140087488908752	16	37		0	ACTIVE
+wait/io/socket/sql/client_connection	140629467156176	16	37		0	ACTIVE
+wait/io/socket/sql/server_unix_socket	140629467186192	1	14		0	ACTIVE
+wait/io/socket/sql/server_tcpip_socket	140629467267056	1	13	0.0.0.0	13000	ACTIVE
 # Get thread id of the default connection
 SELECT THREAD_ID INTO @thread_id
 FROM performance_schema.threads
@@ -67,11 +67,11 @@ WHERE PROCESSLIST_ID = CONNECTION_ID();
 # Connect 1a (con1a,127.0.0.1,root,,test,13000)
 SELECT * FROM performance_schema.socket_instances;
 EVENT_NAME	OBJECT_INSTANCE_BEGIN	THREAD_ID	SOCKET_ID	IP	PORT	STATE
-wait/io/socket/sql/server_unix_socket	140087488855440	1	14		0	ACTIVE
-wait/io/socket/sql/client_connection	140087488876272	18	60	127.0.0.1	46651	ACTIVE
-wait/io/socket/sql/server_tcpip_socket	140087488891504	1	13	0.0.0.0	13000	ACTIVE
-wait/io/socket/sql/client_connection	140087488908752	16	37		0	ACTIVE
-wait/io/socket/sql/client_connection	140087488916368	19	61	127.0.0.1	46652	ACTIVE
+wait/io/socket/sql/client_connection	140629467147216	19	61	127.0.0.1	38475	ACTIVE
+wait/io/socket/sql/client_connection	140629467156176	16	37		0	ACTIVE
+wait/io/socket/sql/server_unix_socket	140629467186192	1	14		0	ACTIVE
+wait/io/socket/sql/client_connection	140629467255408	18	60	127.0.0.1	38474	ACTIVE
+wait/io/socket/sql/server_tcpip_socket	140629467267056	1	13	0.0.0.0	13000	ACTIVE
 # DEBUG 2 - host, protocol
 # /home/cpowers/work/dev/mysql-trunk-wl4896/client//mysql --defaults-file=/home/cpowers/work/dev/mysql-trunk-wl4896/mysql-test/var/my.cnf --host=127.0.0.1 --protocol=TCP --port=13000 --user=root test -e "SELECT current_user();SELECT user();SELECT * FROM performance_schema.socket_instances;"
 current_user()
@@ -79,12 +79,12 @@ root@localhost
 user()
 root@localhost
 EVENT_NAME	OBJECT_INSTANCE_BEGIN	THREAD_ID	SOCKET_ID	IP	PORT	STATE
-wait/io/socket/sql/server_unix_socket	140087488855440	1	14		0	ACTIVE
-wait/io/socket/sql/client_connection	140087488876272	18	60	127.0.0.1	46651	ACTIVE
-wait/io/socket/sql/server_tcpip_socket	140087488891504	1	13	0.0.0.0	13000	ACTIVE
-wait/io/socket/sql/client_connection	140087488908752	16	37		0	ACTIVE
-wait/io/socket/sql/client_connection	140087488916368	19	61	127.0.0.1	46652	ACTIVE
-wait/io/socket/sql/client_connection	140087488975952	20	62	127.0.0.1	46653	ACTIVE
+wait/io/socket/sql/client_connection	140629467104208	20	62	127.0.0.1	38476	ACTIVE
+wait/io/socket/sql/client_connection	140629467147216	19	61	127.0.0.1	38475	ACTIVE
+wait/io/socket/sql/client_connection	140629467156176	16	37		0	ACTIVE
+wait/io/socket/sql/server_unix_socket	140629467186192	1	14		0	ACTIVE
+wait/io/socket/sql/client_connection	140629467255408	18	60	127.0.0.1	38474	ACTIVE
+wait/io/socket/sql/server_tcpip_socket	140629467267056	1	13	0.0.0.0	13000	ACTIVE
 # DEBUG 2a - no host, protocol
 # /home/cpowers/work/dev/mysql-trunk-wl4896/client//mysql --defaults-file=/home/cpowers/work/dev/mysql-trunk-wl4896/mysql-test/var/my.cnf --protocol=TCP --port=13000 --user=root test -e "SELECT current_user();SELECT user();SELECT * FROM performance_schema.socket_instances;"
 current_user()
@@ -92,20 +92,20 @@ root@localhost
 user()
 root@localhost
 EVENT_NAME	OBJECT_INSTANCE_BEGIN	THREAD_ID	SOCKET_ID	IP	PORT	STATE
-wait/io/socket/sql/client_connection	140087488803920	21	62	127.0.0.1	46655	ACTIVE
-wait/io/socket/sql/server_unix_socket	140087488855440	1	14		0	ACTIVE
-wait/io/socket/sql/client_connection	140087488876272	18	60	127.0.0.1	46651	ACTIVE
-wait/io/socket/sql/server_tcpip_socket	140087488891504	1	13	0.0.0.0	13000	ACTIVE
-wait/io/socket/sql/client_connection	140087488908752	16	37		0	ACTIVE
-wait/io/socket/sql/client_connection	140087488916368	19	61	127.0.0.1	46652	ACTIVE
+wait/io/socket/sql/client_connection	140629467097936	21	62	127.0.0.1	38478	ACTIVE
+wait/io/socket/sql/client_connection	140629467147216	19	61	127.0.0.1	38475	ACTIVE
+wait/io/socket/sql/client_connection	140629467156176	16	37		0	ACTIVE
+wait/io/socket/sql/server_unix_socket	140629467186192	1	14		0	ACTIVE
+wait/io/socket/sql/client_connection	140629467255408	18	60	127.0.0.1	38474	ACTIVE
+wait/io/socket/sql/server_tcpip_socket	140629467267056	1	13	0.0.0.0	13000	ACTIVE
 # DEBUG 2b - after execs
 SELECT * FROM performance_schema.socket_instances;
 EVENT_NAME	OBJECT_INSTANCE_BEGIN	THREAD_ID	SOCKET_ID	IP	PORT	STATE
-wait/io/socket/sql/server_unix_socket	140087488855440	1	14		0	ACTIVE
-wait/io/socket/sql/client_connection	140087488876272	18	60	127.0.0.1	46651	ACTIVE
-wait/io/socket/sql/server_tcpip_socket	140087488891504	1	13	0.0.0.0	13000	ACTIVE
-wait/io/socket/sql/client_connection	140087488908752	16	37		0	ACTIVE
-wait/io/socket/sql/client_connection	140087488916368	19	61	127.0.0.1	46652	ACTIVE
+wait/io/socket/sql/client_connection	140629467147216	19	61	127.0.0.1	38475	ACTIVE
+wait/io/socket/sql/client_connection	140629467156176	16	37		0	ACTIVE
+wait/io/socket/sql/server_unix_socket	140629467186192	1	14		0	ACTIVE
+wait/io/socket/sql/client_connection	140629467255408	18	60	127.0.0.1	38474	ACTIVE
+wait/io/socket/sql/server_tcpip_socket	140629467267056	1	13	0.0.0.0	13000	ACTIVE
 # Store the thread id of connection 1 (tcp/ip)
 SELECT THREAD_ID INTO @thread_id
 FROM performance_schema.threads
@@ -119,12 +119,12 @@ WHERE THREAD_ID = @thread_id;
 # DEBUG 3
 SELECT * FROM performance_schema.socket_instances;
 EVENT_NAME	OBJECT_INSTANCE_BEGIN	THREAD_ID	SOCKET_ID	IP	PORT	STATE
-wait/io/socket/sql/server_unix_socket	140087488855440	1	14		0	ACTIVE
-wait/io/socket/sql/client_connection	140087488876272	18	60	127.0.0.1	46651	ACTIVE
-wait/io/socket/sql/client_connection	140087488889488	22	62	127.0.0.1	46656	ACTIVE
-wait/io/socket/sql/server_tcpip_socket	140087488891504	1	13	0.0.0.0	13000	ACTIVE
-wait/io/socket/sql/client_connection	140087488908752	16	37		0	ACTIVE
-wait/io/socket/sql/client_connection	140087488916368	19	61	127.0.0.1	46652	ACTIVE
+wait/io/socket/sql/client_connection	140629467147216	19	61	127.0.0.1	38475	ACTIVE
+wait/io/socket/sql/client_connection	140629467156176	16	37		0	ACTIVE
+wait/io/socket/sql/server_unix_socket	140629467186192	1	14		0	ACTIVE
+wait/io/socket/sql/client_connection	140629467195600	22	62	127.0.0.1	38479	ACTIVE
+wait/io/socket/sql/client_connection	140629467255408	18	60	127.0.0.1	38474	ACTIVE
+wait/io/socket/sql/server_tcpip_socket	140629467267056	1	13	0.0.0.0	13000	ACTIVE
 # Store the thread_id of connection 2 (tcp/ip)
 SELECT THREAD_ID INTO @thread_id
 FROM performance_schema.threads
@@ -138,13 +138,13 @@ WHERE THREAD_ID = @thread_id;
 # DEBUG 4
 SELECT * FROM performance_schema.socket_instances;
 EVENT_NAME	OBJECT_INSTANCE_BEGIN	THREAD_ID	SOCKET_ID	IP	PORT	STATE
-wait/io/socket/sql/client_connection	140087488800560	23	63		0	ACTIVE
-wait/io/socket/sql/server_unix_socket	140087488855440	1	14		0	ACTIVE
-wait/io/socket/sql/client_connection	140087488876272	18	60	127.0.0.1	46651	ACTIVE
-wait/io/socket/sql/client_connection	140087488889488	22	62	127.0.0.1	46656	ACTIVE
-wait/io/socket/sql/server_tcpip_socket	140087488891504	1	13	0.0.0.0	13000	ACTIVE
-wait/io/socket/sql/client_connection	140087488908752	16	37		0	ACTIVE
-wait/io/socket/sql/client_connection	140087488916368	19	61	127.0.0.1	46652	ACTIVE
+wait/io/socket/sql/client_connection	140629467073520	23	63		0	ACTIVE
+wait/io/socket/sql/client_connection	140629467147216	19	61	127.0.0.1	38475	ACTIVE
+wait/io/socket/sql/client_connection	140629467156176	16	37		0	ACTIVE
+wait/io/socket/sql/server_unix_socket	140629467186192	1	14		0	ACTIVE
+wait/io/socket/sql/client_connection	140629467195600	22	62	127.0.0.1	38479	ACTIVE
+wait/io/socket/sql/client_connection	140629467255408	18	60	127.0.0.1	38474	ACTIVE
+wait/io/socket/sql/server_tcpip_socket	140629467267056	1	13	0.0.0.0	13000	ACTIVE
 # Store the thread id of connection 3 (unix domain)
 SELECT THREAD_ID INTO @thread_id
 FROM performance_schema.threads
@@ -324,4 +324,4 @@ NOT IN (SELECT EVENT_NAME,OBJECT_INSTANC
 FROM my_socket_instances)
 ORDER BY THREAD_ID;
 EVENT_NAME	OBJECT_INSTANCE_BEGIN	THREAD_ID	SOCKET_ID	IP	PORT	STATE
-wait/io/socket/sql/client_connection	140087488916368	19	61	127.0.0.1	46652	ACTIVE
+wait/io/socket/sql/client_connection	140629467147216	19	61	127.0.0.1	38475	ACTIVE

=== modified file 'mysql-test/suite/perfschema/t/socket_instances_func.test'
--- a/mysql-test/suite/perfschema/t/socket_instances_func.test	2011-07-25 17:25:43 +0000
+++ b/mysql-test/suite/perfschema/t/socket_instances_func.test	2011-07-25 19:01:56 +0000
@@ -31,7 +31,7 @@ SELECT * FROM performance_schema.socket_
 
 --echo # DEBUG 1
 SELECT * FROM performance_schema.socket_instances;
---exec $MYSQL --host=$MYSQL_HOST --port=$MASTER_MYPORT --user=root test -e "SELECT current_user();SELECT user();SELECT * FROM performance_schema.socket_instances;"
+--exec $MYSQL --host=127.0.0.1 --port=$MASTER_MYPORT --user=root test -e "SELECT current_user();SELECT user();SELECT * FROM performance_schema.socket_instances;"
 --echo # DEBUG 1a
 SELECT * FROM performance_schema.socket_instances;
 
@@ -48,18 +48,18 @@ let $con0_thread_id = `SELECT @thread_id
 #
 # Have a connection with IP = '127.0.0.1,'
 
---echo # Establish local TCP/IP connection (con1,$MYSQL_HOST,root,,test,,)
+--echo # Establish local TCP/IP connection (con1,127.0.0.1,root,,test,,)
 #--disable_query_log
---echo # Connect 1 (con1,$MYSQL_HOST,root,,test,,$MASTER_MYPORT)
---connect (con1,$MYSQL_HOST,root,,test,,$MASTER_MYPORT)
---echo # Connect 1a (con1a,$MYSQL_HOST,root,,test,$MASTER_MYPORT)
---connect (con1a,$MYSQL_HOST,root,,test,$MASTER_MYPORT)
+--echo # Connect 1 (con1,127.0.0.1,root,,test,,$MASTER_MYPORT)
+--connect (con1,127.0.0.1,root,,test,,$MASTER_MYPORT)
+--echo # Connect 1a (con1a,127.0.0.1,root,,test,$MASTER_MYPORT)
+--connect (con1a,127.0.0.1,root,,test,$MASTER_MYPORT)
 #--enable_query_log
 
 SELECT * FROM performance_schema.socket_instances;
 --echo # DEBUG 2 - host, protocol
---echo # $MYSQL --host=$MYSQL_HOST --protocol=TCP --port=$MASTER_MYPORT --user=root test -e "SELECT current_user();SELECT user();SELECT * FROM performance_schema.socket_instances;"
---exec $MYSQL --host=$MYSQL_HOST --protocol=TCP --port=$MASTER_MYPORT --user=root test -e "SELECT current_user();SELECT user();SELECT * FROM performance_schema.socket_instances;"
+--echo # $MYSQL --host=127.0.0.1 --protocol=TCP --port=$MASTER_MYPORT --user=root test -e "SELECT current_user();SELECT user();SELECT * FROM performance_schema.socket_instances;"
+--exec $MYSQL --host=127.0.0.1 --protocol=TCP --port=$MASTER_MYPORT --user=root test -e "SELECT current_user();SELECT user();SELECT * FROM performance_schema.socket_instances;"
 --echo # DEBUG 2a - no host, protocol
 --echo # $MYSQL --protocol=TCP --port=$MASTER_MYPORT --user=root test -e "SELECT current_user();SELECT user();SELECT * FROM performance_schema.socket_instances;"
 --exec $MYSQL --protocol=TCP --port=$MASTER_MYPORT --user=root test -e "SELECT current_user();SELECT user();SELECT * FROM performance_schema.socket_instances;"
@@ -87,9 +87,9 @@ let $con1_port = `SELECT @port`;
 #
 # Have a connection with IP = '127.0.0.1,'
 
---echo # Establish a second local TCP/IP connection (con2,$MYSQL_HOST,root,,test,,)
+--echo # Establish a second local TCP/IP connection (con2,127.0.0.1,root,,test,,)
 #--disable_query_log
---connect (con2,$MYSQL_HOST,root,,test,,$MASTER_MYPORT)
+--connect (con2,127.0.0.1,root,,test,,$MASTER_MYPORT)
 #--enable_query_log
 
 --echo # DEBUG 3
@@ -326,7 +326,7 @@ eval set @thread_id = $con1_thread_id;
 --enable_query_log
 
 eval SELECT EVENT_NAME = 'wait/io/socket/sql/client_connection'
-        AND IP = '$MYSQL_HOST'
+        AND IP = '127.0.0.1'
         AND PORT = @port
 AS 'Expect 1'
 FROM performance_schema.socket_instances
@@ -354,7 +354,7 @@ eval set @thread_id = $con2_thread_id;
 --enable_query_log
 
 eval SELECT EVENT_NAME = 'wait/io/socket/sql/client_connection'
-        AND IP = '$MYSQL_HOST'
+        AND IP = '127.0.0.1'
         AND PORT = @port
 AS 'Expect 1'
 FROM performance_schema.socket_instances

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (chris.powers:3334 to 3335) WL#4896Christopher Powers26 Jul