List:Commits« Previous MessageNext Message »
From:Christopher Powers Date:December 9 2010 3:50pm
Subject:bzr commit into mysql-trunk-wl4896 branch (chris.powers:3215) WL#4896
View as plain text  
#At file:///home/cpowers/work/dev/mysql-trunk-wl4896/ based on revid:chris.powers@stripped

 3215 Christopher Powers	2010-12-09
      WL#4896 Peformance schema Net IO
      
      Cleaning up PB2, part II

    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/r/mysqld--help-notwin.result
      mysql-test/suite/sys_vars/r/all_vars.result
=== modified file 'mysql-test/r/mysqld--help-notwin.result'
--- a/mysql-test/r/mysqld--help-notwin.result	2010-12-02 15:05:07 +0000
+++ b/mysql-test/r/mysqld--help-notwin.result	2010-12-09 15:50:04 +0000
@@ -441,6 +441,10 @@ The following options may be given as th
  Maximum number of rwlock instruments.
  --performance-schema-max-rwlock-instances=# 
  Maximum number of instrumented RWLOCK objects.
+ --performance-schema-max-socket-classes=# 
+ Maximum number of socket instruments.
+ --performance-schema-max-sockets=# 
+ Maximum number of opened instrumented sockets.
  --performance-schema-max-table-handles=# 
  Maximum number of opened instrumented tables.
  --performance-schema-max-table-instances=# 
@@ -885,6 +889,8 @@ performance-schema-max-mutex-classes 200
 performance-schema-max-mutex-instances 1000000
 performance-schema-max-rwlock-classes 30
 performance-schema-max-rwlock-instances 1000000
+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/sys_vars/r/all_vars.result'
--- a/mysql-test/suite/sys_vars/r/all_vars.result	2010-12-08 21:18:05 +0000
+++ b/mysql-test/suite/sys_vars/r/all_vars.result	2010-12-09 15:50:04 +0000
@@ -12,11 +12,9 @@ select variable_name as `There should be
 left join t1 on variable_name=test_name where test_name is null;
 There should be *no* variables listed below:
 INNODB_STATS_TRANSIENT_SAMPLE_PAGES
-PFS_MAX_SOCKETS
 INNODB_STATS_PERSISTENT_SAMPLE_PAGES
 RELAY_LOG_BASENAME
 LOG_BIN_BASENAME
-PFS_MAX_SOCKET_CLASSES
 INNODB_ANALYZE_IS_PERSISTENT
 INNODB_RESET_MONITOR_COUNTER
 INNODB_RESET_ALL_MONITOR_COUNTER
@@ -25,11 +23,9 @@ INNODB_DISABLE_MONITOR_COUNTER
 INNODB_ENABLE_MONITOR_COUNTER
 INNODB_FILE_FORMAT_MAX
 INNODB_STATS_TRANSIENT_SAMPLE_PAGES
-PFS_MAX_SOCKETS
 INNODB_STATS_PERSISTENT_SAMPLE_PAGES
 RELAY_LOG_BASENAME
 LOG_BIN_BASENAME
-PFS_MAX_SOCKET_CLASSES
 INNODB_ANALYZE_IS_PERSISTENT
 INNODB_RESET_MONITOR_COUNTER
 INNODB_RESET_ALL_MONITOR_COUNTER

=== 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-12-09 15:50:04 +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-12-09 15:50:04 +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-12-09 15:50:04 +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-12-09 15:50:04 +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-12-09 15:50:04 +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-12-09 15:50:04 +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;
+


Attachment: [text/bzr-bundle] bzr/chris.powers@oracle.com-20101209155004-5aaqnkr4k0iqwe3m.bundle
Thread
bzr commit into mysql-trunk-wl4896 branch (chris.powers:3215) WL#4896Christopher Powers9 Dec