From: Christopher Powers
Date: March 19 2011 1:42am
Subject: bzr push into mysql-trunk branch (chris.powers:3264)
List-Archive: http://lists.mysql.com/commits/133370
Message-Id: <20110319014256.5BD351DB0335@xeno.mysql.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6271259515769962424=="

--===============6271259515769962424==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

 3264 cpowers	2011-03-18 [merge]
      merge

    modified:
      include/mysql/psi/psi_abi_v1.h.pp
=== modified file 'include/mysql/psi/psi.h'
--- a/include/mysql/psi/psi.h	2011-03-18 22:24:30 +0000
+++ b/include/mysql/psi/psi.h	2011-03-19 01:36:46 +0000
@@ -275,9 +275,9 @@ enum PSI_table_lock_operation
 enum PSI_socket_state
 {
   /** Idle, waiting for the next command. */
-  PSI_SOCKET_STATE_IDLE= 0,
+  PSI_SOCKET_STATE_IDLE= 1,
   /** Active, executing a command. */
-  PSI_SOCKET_STATE_ACTIVE= 1
+  PSI_SOCKET_STATE_ACTIVE= 2
 };
 
 /** Operation performed on an instrumented socket. */

=== modified file 'scripts/mysql_system_tables.sql'
--- a/scripts/mysql_system_tables.sql	2011-03-18 23:37:18 +0000
+++ b/scripts/mysql_system_tables.sql	2011-03-19 01:36:46 +0000
@@ -383,10 +383,11 @@ DROP PREPARE stmt;
 SET @cmd="CREATE TABLE performance_schema.socket_instances("
   "EVENT_NAME VARCHAR(128) not null,"
   "OBJECT_INSTANCE_BEGIN BIGINT unsigned not null,"
-  "THREAD_ID INTEGER not null,"
+  "THREAD_ID INTEGER,"
   "SOCKET_ID INTEGER not null,"
   "IP VARCHAR(64) not null,"
-  "PORT INTEGER not null"
+  "PORT INTEGER not null,"
+  "STATE ENUM('IDLE','ACTIVE') not null"
   ")ENGINE=PERFORMANCE_SCHEMA;";
 
 SET @str = IF(@have_pfs = 1, @cmd, 'SET @dummy = 0');

=== modified file 'storage/perfschema/table_socket_instances.cc'
--- a/storage/perfschema/table_socket_instances.cc	2011-03-18 22:24:30 +0000
+++ b/storage/perfschema/table_socket_instances.cc	2011-03-19 01:36:46 +0000
@@ -59,12 +59,17 @@ static const TABLE_FIELD_TYPE field_type
     { C_STRING_WITH_LEN("PORT") },
     { C_STRING_WITH_LEN("int(11)") },
     { NULL, 0}
+  },
+  {
+    { C_STRING_WITH_LEN("STATE") },
+    { C_STRING_WITH_LEN("enum('IDLE','ACTIVE')") },
+    { NULL, 0}
   }
 };
 
 TABLE_FIELD_DEF
 table_socket_instances::m_field_def=
-{ 6, field_types };
+{ 7, field_types };
 
 PFS_engine_table_share
 table_socket_instances::m_share=
@@ -155,7 +160,8 @@ void table_socket_instances::make_row(PF
   m_row.m_event_name_length=  safe_class->m_name_length;
   m_row.m_identity=           pfs->m_identity;
   m_row.m_fd=                 pfs->m_fd;
-
+  m_row.m_state=              (pfs->m_idle ? PSI_SOCKET_STATE_IDLE
+                                           : PSI_SOCKET_STATE_ACTIVE);
   PFS_thread *safe_thread= sanitize_thread(pfs->m_thread_owner);
 
   if (safe_thread != NULL)
@@ -208,6 +214,9 @@ int table_socket_instances::read_row_val
       case 5: /* PORT */
         set_field_ulong(f, m_row.m_port);
         break;
+      case 6: /* STATE */
+        set_field_enum(f, m_row.m_state);
+        break;
       default:
         DBUG_ASSERT(false);
       }

=== modified file 'storage/perfschema/table_socket_instances.h'
--- a/storage/perfschema/table_socket_instances.h	2011-03-18 19:05:00 +0000
+++ b/storage/perfschema/table_socket_instances.h	2011-03-19 01:36:46 +0000
@@ -50,6 +50,8 @@ struct row_socket_instances
   uint m_ip_length;
   /** Column PORT */
   uint m_port;
+  /** Socket state: ACTIVE or IDLE */
+  PSI_socket_state m_state;
 
   row_socket_instances() {m_thread_id= false;}
 };


--===============6271259515769962424==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/cpowers@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: cpowers@tma-1-20110319014219-hua2dkcxl5mnayke
# target_branch: file:///home/cpowers/work/dev/mysql-trunk-wl4896/
# testament_sha1: 45c8c36dc56cf101bdcab767f39fdb7ca5876803
# timestamp: 2011-03-18 20:42:56 -0500
# source_branch: file:///home/cpowers/work/dev/mysql-trunk/
# base_revision_id: chris.powers@stripped\
#   cojf6h572ss2it3w
# 
# Begin bundle
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
Gs3rmLcrOwP8XckU4UJC6kxGnA==


--===============6271259515769962424==--