List:Commits« Previous MessageNext Message »
From:Christopher Powers Date:August 16 2010 4:51pm
Subject:bzr commit into mysql-next-mr-wl4896 branch (chris.powers:3165) WL#4896
View as plain text  
#At file:///home/cpowers/work/dev/dev-wl4896/mysql/ based on revid:chris.powers@stripped

 3165 Christopher Powers	2010-08-16
      WL#4896 PERFORMANCE_SCHEMA Net IO
      - Update mysql-test-run test cases and results
      - Correct memory count assert in pfs_show_status()
      - Add pfs_max_socket* test cases

    added:
      mysql-test/suite/sys_vars/r/pfs_max_socket_classes_basic.result
      mysql-test/suite/sys_vars/r/pfs_max_sockets_basic.result
      mysql-test/suite/sys_vars/t/pfs_max_socket_classes_basic-master.opt
      mysql-test/suite/sys_vars/t/pfs_max_socket_classes_basic.test
      mysql-test/suite/sys_vars/t/pfs_max_sockets_basic-master.opt
      mysql-test/suite/sys_vars/t/pfs_max_sockets_basic.test
    modified:
      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_nothing.result
      mysql-test/suite/perfschema/r/start_server_off.result
      storage/perfschema/pfs_engine_table.cc
=== modified file 'mysql-test/suite/perfschema/r/start_server_no_cond_class.result'
--- a/mysql-test/suite/perfschema/r/start_server_no_cond_class.result	2010-05-07 12:14:13 +0000
+++ b/mysql-test/suite/perfschema/r/start_server_no_cond_class.result	2010-08-16 16:51:36 +0000
@@ -49,6 +49,8 @@ performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	1000
 performance_schema_max_rwlock_classes	20
 performance_schema_max_rwlock_instances	1000
+performance_schema_max_socket_classes	50
+performance_schema_max_sockets	10000
 performance_schema_max_table_handles	10000
 performance_schema_max_table_instances	1000
 performance_schema_max_thread_classes	50

=== modified file 'mysql-test/suite/perfschema/r/start_server_no_cond_inst.result'
--- a/mysql-test/suite/perfschema/r/start_server_no_cond_inst.result	2010-05-07 12:14:13 +0000
+++ b/mysql-test/suite/perfschema/r/start_server_no_cond_inst.result	2010-08-16 16:51:36 +0000
@@ -49,6 +49,8 @@ performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	1000
 performance_schema_max_rwlock_classes	20
 performance_schema_max_rwlock_instances	1000
+performance_schema_max_socket_classes	50
+performance_schema_max_sockets	10000
 performance_schema_max_table_handles	10000
 performance_schema_max_table_instances	1000
 performance_schema_max_thread_classes	50

=== modified file 'mysql-test/suite/perfschema/r/start_server_no_file_class.result'
--- a/mysql-test/suite/perfschema/r/start_server_no_file_class.result	2010-05-07 12:14:13 +0000
+++ b/mysql-test/suite/perfschema/r/start_server_no_file_class.result	2010-08-16 16:51:36 +0000
@@ -49,6 +49,8 @@ performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	1000
 performance_schema_max_rwlock_classes	20
 performance_schema_max_rwlock_instances	1000
+performance_schema_max_socket_classes	50
+performance_schema_max_sockets	10000
 performance_schema_max_table_handles	10000
 performance_schema_max_table_instances	1000
 performance_schema_max_thread_classes	50

=== modified file 'mysql-test/suite/perfschema/r/start_server_no_file_inst.result'
--- a/mysql-test/suite/perfschema/r/start_server_no_file_inst.result	2010-05-07 12:14:13 +0000
+++ b/mysql-test/suite/perfschema/r/start_server_no_file_inst.result	2010-08-16 16:51:36 +0000
@@ -49,6 +49,8 @@ performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	1000
 performance_schema_max_rwlock_classes	20
 performance_schema_max_rwlock_instances	1000
+performance_schema_max_socket_classes	50
+performance_schema_max_sockets	10000
 performance_schema_max_table_handles	10000
 performance_schema_max_table_instances	1000
 performance_schema_max_thread_classes	50

=== modified file 'mysql-test/suite/perfschema/r/start_server_no_mutex_class.result'
--- a/mysql-test/suite/perfschema/r/start_server_no_mutex_class.result	2010-05-07 12:14:13 +0000
+++ b/mysql-test/suite/perfschema/r/start_server_no_mutex_class.result	2010-08-16 16:51:36 +0000
@@ -49,6 +49,8 @@ performance_schema_max_mutex_classes	0
 performance_schema_max_mutex_instances	1000
 performance_schema_max_rwlock_classes	20
 performance_schema_max_rwlock_instances	1000
+performance_schema_max_socket_classes	50
+performance_schema_max_sockets	10000
 performance_schema_max_table_handles	10000
 performance_schema_max_table_instances	1000
 performance_schema_max_thread_classes	50

=== modified file 'mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result'
--- a/mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result	2010-05-07 12:14:13 +0000
+++ b/mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result	2010-08-16 16:51:36 +0000
@@ -49,6 +49,8 @@ performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	0
 performance_schema_max_rwlock_classes	20
 performance_schema_max_rwlock_instances	1000
+performance_schema_max_socket_classes	50
+performance_schema_max_sockets	10000
 performance_schema_max_table_handles	10000
 performance_schema_max_table_instances	1000
 performance_schema_max_thread_classes	50

=== modified file 'mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result'
--- a/mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result	2010-05-07 12:14:13 +0000
+++ b/mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result	2010-08-16 16:51:36 +0000
@@ -49,6 +49,8 @@ performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	1000
 performance_schema_max_rwlock_classes	0
 performance_schema_max_rwlock_instances	1000
+performance_schema_max_socket_classes	50
+performance_schema_max_sockets	10000
 performance_schema_max_table_handles	10000
 performance_schema_max_table_instances	1000
 performance_schema_max_thread_classes	50

=== modified file 'mysql-test/suite/perfschema/r/start_server_nothing.result'
--- a/mysql-test/suite/perfschema/r/start_server_nothing.result	2010-05-17 10:05:47 +0000
+++ b/mysql-test/suite/perfschema/r/start_server_nothing.result	2010-08-16 16:51:36 +0000
@@ -13,7 +13,7 @@ count(*)
 8
 select count(*) > 1 from performance_schema.SETUP_INSTRUMENTS;
 count(*) > 1
-0
+1
 select count(*) from performance_schema.SETUP_TIMERS;
 count(*)
 1
@@ -49,6 +49,8 @@ performance_schema_max_mutex_classes	0
 performance_schema_max_mutex_instances	0
 performance_schema_max_rwlock_classes	0
 performance_schema_max_rwlock_instances	0
+performance_schema_max_socket_classes	50
+performance_schema_max_sockets	10000
 performance_schema_max_table_handles	0
 performance_schema_max_table_instances	0
 performance_schema_max_thread_classes	0
@@ -69,6 +71,8 @@ performance_schema_max_mutex_classes	0
 performance_schema_max_mutex_instances	0
 performance_schema_max_rwlock_classes	0
 performance_schema_max_rwlock_instances	0
+performance_schema_max_socket_classes	50
+performance_schema_max_sockets	10000
 performance_schema_max_table_handles	0
 performance_schema_max_table_instances	0
 performance_schema_max_thread_classes	0
@@ -76,6 +80,8 @@ performance_schema_max_thread_instances
 select * from performance_schema.SETUP_INSTRUMENTS;
 NAME	ENABLED	TIMED
 wait/io/table/sql/handler	YES	YES
+wait/io/socket/sql/network_init	YES	YES
+wait/io/socket/sql/handle_connection	YES	YES
 select TIMER_NAME from performance_schema.PERFORMANCE_TIMERS;
 TIMER_NAME
 CYCLE
@@ -106,6 +112,8 @@ select * from performance_schema.EVENTS_
 THREAD_ID	EVENT_ID	EVENT_NAME	SOURCE	TIMER_START	TIMER_END	TIMER_WAIT	SPINS	OBJECT_SCHEMA	OBJECT_NAME	OBJECT_TYPE	OBJECT_INSTANCE_BEGIN	NESTING_EVENT_ID	OPERATION	NUMBER_OF_BYTES	FLAGS
 select * from performance_schema.EVENTS_WAITS_SUMMARY_BY_EVENT_NAME;
 EVENT_NAME	COUNT_STAR	SUM_TIMER_WAIT	MIN_TIMER_WAIT	AVG_TIMER_WAIT	MAX_TIMER_WAIT
+wait/io/socket/sql/network_init	0	0	0	0	0
+wait/io/socket/sql/handle_connection	0	0	0	0	0
 select * from performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE;
 EVENT_NAME	OBJECT_INSTANCE_BEGIN	COUNT_STAR	SUM_TIMER_WAIT	MIN_TIMER_WAIT	AVG_TIMER_WAIT	MAX_TIMER_WAIT
 select * from performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME;

=== modified file 'mysql-test/suite/perfschema/r/start_server_off.result'
--- a/mysql-test/suite/perfschema/r/start_server_off.result	2010-05-07 12:14:13 +0000
+++ b/mysql-test/suite/perfschema/r/start_server_off.result	2010-08-16 16:51:36 +0000
@@ -49,6 +49,8 @@ performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	1000
 performance_schema_max_rwlock_classes	20
 performance_schema_max_rwlock_instances	1000
+performance_schema_max_socket_classes	50
+performance_schema_max_sockets	10000
 performance_schema_max_table_handles	10000
 performance_schema_max_table_instances	1000
 performance_schema_max_thread_classes	50
@@ -67,6 +69,7 @@ Performance_schema_mutex_classes_lost	0
 Performance_schema_mutex_instances_lost	0
 Performance_schema_rwlock_classes_lost	0
 Performance_schema_rwlock_instances_lost	0
+Performance_schema_socket_instances_lost	0
 Performance_schema_table_handles_lost	0
 Performance_schema_table_instances_lost	0
 Performance_schema_thread_classes_lost	0

=== added file 'mysql-test/suite/sys_vars/r/pfs_max_socket_classes_basic.result'
--- a/mysql-test/suite/sys_vars/r/pfs_max_socket_classes_basic.result	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/sys_vars/r/pfs_max_socket_classes_basic.result	2010-08-16 16:51:36 +0000
@@ -0,0 +1,23 @@
+select @@global.performance_schema_max_socket_classes;
+@@global.performance_schema_max_socket_classes
+123
+select @@session.performance_schema_max_socket_classes;
+ERROR HY000: Variable 'performance_schema_max_socket_classes' is a GLOBAL variable
+show global variables like 'performance_schema_max_socket_classes';
+Variable_name	Value
+performance_schema_max_socket_classes	123
+show session variables like 'performance_schema_max_socket_classes';
+Variable_name	Value
+performance_schema_max_socket_classes	123
+select * from information_schema.global_variables
+where variable_name='performance_schema_max_socket_classes';
+VARIABLE_NAME	VARIABLE_VALUE
+PERFORMANCE_SCHEMA_MAX_SOCKET_CLASSES	123
+select * from information_schema.session_variables
+where variable_name='performance_schema_max_socket_classes';
+VARIABLE_NAME	VARIABLE_VALUE
+PERFORMANCE_SCHEMA_MAX_SOCKET_CLASSES	123
+set global performance_schema_max_socket_classes=1;
+ERROR HY000: Variable 'performance_schema_max_socket_classes' is a read only variable
+set session performance_schema_max_socket_classes=1;
+ERROR HY000: Variable 'performance_schema_max_socket_classes' is a read only variable

=== added file 'mysql-test/suite/sys_vars/r/pfs_max_sockets_basic.result'
--- a/mysql-test/suite/sys_vars/r/pfs_max_sockets_basic.result	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/sys_vars/r/pfs_max_sockets_basic.result	2010-08-16 16:51:36 +0000
@@ -0,0 +1,23 @@
+select @@global.performance_schema_max_sockets;
+@@global.performance_schema_max_sockets
+123
+select @@session.performance_schema_max_sockets;
+ERROR HY000: Variable 'performance_schema_max_sockets' is a GLOBAL variable
+show global variables like 'performance_schema_max_sockets';
+Variable_name	Value
+performance_schema_max_sockets	123
+show session variables like 'performance_schema_max_sockets';
+Variable_name	Value
+performance_schema_max_sockets	123
+select * from information_schema.global_variables
+where variable_name='performance_schema_max_sockets';
+VARIABLE_NAME	VARIABLE_VALUE
+PERFORMANCE_SCHEMA_MAX_SOCKETS	123
+select * from information_schema.session_variables
+where variable_name='performance_schema_max_sockets';
+VARIABLE_NAME	VARIABLE_VALUE
+PERFORMANCE_SCHEMA_MAX_SOCKETS	123
+set global performance_schema_max_sockets=1;
+ERROR HY000: Variable 'performance_schema_max_sockets' is a read only variable
+set session performance_schema_max_sockets=1;
+ERROR HY000: Variable 'performance_schema_max_sockets' is a read only variable

=== added file 'mysql-test/suite/sys_vars/t/pfs_max_socket_classes_basic-master.opt'
--- a/mysql-test/suite/sys_vars/t/pfs_max_socket_classes_basic-master.opt	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/sys_vars/t/pfs_max_socket_classes_basic-master.opt	2010-08-16 16:51:36 +0000
@@ -0,0 +1 @@
+--loose-enable-performance-schema --loose-performance-schema-max-socket-classes=123

=== added file 'mysql-test/suite/sys_vars/t/pfs_max_socket_classes_basic.test'
--- a/mysql-test/suite/sys_vars/t/pfs_max_socket_classes_basic.test	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/sys_vars/t/pfs_max_socket_classes_basic.test	2010-08-16 16:51:36 +0000
@@ -0,0 +1,47 @@
+# Copyright (C) 2010 Sun Microsystems, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+#
+# Only global
+#
+
+select @@global.performance_schema_max_socket_classes;
+
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+select @@session.performance_schema_max_socket_classes;
+
+show global variables like 'performance_schema_max_socket_classes';
+
+show session variables like 'performance_schema_max_socket_classes';
+
+select * from information_schema.global_variables
+  where variable_name='performance_schema_max_socket_classes';
+
+select * from information_schema.session_variables
+  where variable_name='performance_schema_max_socket_classes';
+
+#
+# Read-only
+#
+
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+set global performance_schema_max_socket_classes=1;
+
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+set session performance_schema_max_socket_classes=1;
+

=== added file 'mysql-test/suite/sys_vars/t/pfs_max_sockets_basic-master.opt'
--- a/mysql-test/suite/sys_vars/t/pfs_max_sockets_basic-master.opt	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/sys_vars/t/pfs_max_sockets_basic-master.opt	2010-08-16 16:51:36 +0000
@@ -0,0 +1 @@
+--loose-enable-performance-schema --loose-performance-schema-max-sockets=123

=== added file 'mysql-test/suite/sys_vars/t/pfs_max_sockets_basic.test'
--- a/mysql-test/suite/sys_vars/t/pfs_max_sockets_basic.test	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/sys_vars/t/pfs_max_sockets_basic.test	2010-08-16 16:51:36 +0000
@@ -0,0 +1,47 @@
+# Copyright (C) 2010 Sun Microsystems, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+#
+# Only global
+#
+
+select @@global.performance_schema_max_sockets;
+
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+select @@session.performance_schema_max_sockets;
+
+show global variables like 'performance_schema_max_sockets';
+
+show session variables like 'performance_schema_max_sockets';
+
+select * from information_schema.global_variables
+  where variable_name='performance_schema_max_sockets';
+
+select * from information_schema.session_variables
+  where variable_name='performance_schema_max_sockets';
+
+#
+# Read-only
+#
+
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+set global performance_schema_max_sockets=1;
+
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+set session performance_schema_max_sockets=1;
+

=== modified file 'storage/perfschema/pfs_engine_table.cc'
--- a/storage/perfschema/pfs_engine_table.cc	2010-08-04 03:19:48 +0000
+++ b/storage/perfschema/pfs_engine_table.cc	2010-08-16 16:51:36 +0000
@@ -628,131 +628,144 @@ bool pfs_show_status(handlerton *hton, T
       total_memory+= size;
       break;
     case 23:
+      name= "(PFS_SOCKET_CLASS).ROW_SIZE";
+      size= sizeof(PFS_socket_class);
+      break;
+    case 24:
+      name= "(PFS_SOCKET_CLASS).ROW_COUNT";
+      size= socket_class_max;
+      break;
+    case 25:
+      name= "(PFS_SOCKET_CLASS).MEMORY";
+      size= socket_class_max * sizeof(PFS_socket_class);
+      total_memory+= size;
+      break;
+    case 26:
       name= "MUTEX_INSTANCES.ROW_SIZE";
       size= sizeof(PFS_mutex);
       break;
-    case 24:
+    case 27:
       name= "MUTEX_INSTANCES.ROW_COUNT";
       size= mutex_max;
       break;
-    case 25:
+    case 28:
       name= "MUTEX_INSTANCES.MEMORY";
       size= mutex_max * sizeof(PFS_mutex);
       total_memory+= size;
       break;
-    case 26:
+    case 29:
       name= "RWLOCK_INSTANCES.ROW_SIZE";
       size= sizeof(PFS_rwlock);
       break;
-    case 27:
+    case 30:
       name= "RWLOCK_INSTANCES.ROW_COUNT";
       size= rwlock_max;
       break;
-    case 28:
+    case 31:
       name= "RWLOCK_INSTANCES.MEMORY";
       size= rwlock_max * sizeof(PFS_rwlock);
       total_memory+= size;
       break;
-    case 29:
+    case 32:
       name= "COND_INSTANCES.ROW_SIZE";
       size= sizeof(PFS_cond);
       break;
-    case 30:
+    case 33:
       name= "COND_INSTANCES.ROW_COUNT";
       size= cond_max;
       break;
-    case 31:
+    case 34:
       name= "COND_INSTANCES.MEMORY";
       size= cond_max * sizeof(PFS_cond);
       total_memory+= size;
       break;
-    case 32:
+    case 35:
       name= "PROCESSLIST.ROW_SIZE";
       size= sizeof(PFS_thread);
       break;
-    case 33:
+    case 36:
       name= "PROCESSLIST.ROW_COUNT";
       size= thread_max;
       break;
-    case 34:
+    case 37:
       name= "PROCESSLIST.MEMORY";
       size= thread_max * sizeof(PFS_thread);
       total_memory+= size;
       break;
-    case 35:
+    case 38:
       name= "FILE_INSTANCES.ROW_SIZE";
       size= sizeof(PFS_file);
       break;
-    case 36:
+    case 39:
       name= "FILE_INSTANCES.ROW_COUNT";
       size= file_max;
       break;
-    case 37:
+    case 40:
       name= "FILE_INSTANCES.MEMORY";
       size= file_max * sizeof(PFS_file);
       total_memory+= size;
       break;
-    case 38:
+    case 41:
       name= "(PFS_FILE_HANDLE).ROW_SIZE";
       size= sizeof(PFS_file*);
       break;
-    case 39:
+    case 42:
       name= "(PFS_FILE_HANDLE).ROW_COUNT";
       size= file_handle_max;
       break;
-    case 40:
+    case 43:
       name= "(PFS_FILE_HANDLE).MEMORY";
       size= file_handle_max * sizeof(PFS_file*);
       total_memory+= size;
       break;
-    case 41:
+    case 44:
       name= "EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME.ROW_SIZE";
       size= sizeof(PFS_single_stat_chain);
       break;
-    case 42:
+    case 45:
       name= "EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME.ROW_COUNT";
       size= thread_max * instr_class_per_thread;
       break;
-    case 43:
+    case 46:
       name= "EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME.MEMORY";
       size= thread_max * instr_class_per_thread * sizeof(PFS_single_stat_chain);
       total_memory+= size;
       break;
-    case 44:
+    case 47:
       name= "(PFS_TABLE_SHARE).ROW_SIZE";
       size= sizeof(PFS_table_share);
       break;
-    case 45:
+    case 48:
       name= "(PFS_TABLE_SHARE).ROW_COUNT";
       size= table_share_max;
       break;
-    case 46:
+    case 49:
       name= "(PFS_TABLE_SHARE).MEMORY";
       size= table_share_max * sizeof(PFS_table_share);
       total_memory+= size;
       break;
-    case 47:
+    case 50:
       name= "(PFS_TABLE).ROW_SIZE";
       size= sizeof(PFS_table);
       break;
-    case 48:
+    case 51:
       name= "(PFS_TABLE).ROW_COUNT";
       size= table_max;
       break;
-    case 49:
+    case 52:
       name= "(PFS_TABLE).MEMORY";
       size= table_max * sizeof(PFS_table);
       total_memory+= size;
       break;
-    case 50:
+    case 53:
       name= "SOCKET_INSTANCES.ROW_SIZE";
       size= sizeof(PFS_socket);
       break;
-    case 51:
+    case 54:
       name= "SOCKET_INSTANCES.ROW_COUNT";
       size= socket_instances_max;
       break;
-    case 52:
+    case 55:
       name= "SOCKET_INSTANCES.MEMORY";
       size= socket_instances_max * sizeof(PFS_socket);
       total_memory+= size;
@@ -761,7 +774,7 @@ bool pfs_show_status(handlerton *hton, T
       This case must be last,
       for aggregation in total_memory.
     */
-    case 53:
+    case 56:
       name= "PERFORMANCE_SCHEMA.MEMORY";
       size= total_memory;
       /* This will fail if something is not advertised here */


Attachment: [text/bzr-bundle] bzr/chris.powers@oracle.com-20100816165136-nz8ojy1ga0zkxj16.bundle
Thread
bzr commit into mysql-next-mr-wl4896 branch (chris.powers:3165) WL#4896Christopher Powers19 Aug