From: Christopher Powers Date: December 9 2010 3:50pm Subject: bzr push into mysql-trunk-wl4896 branch (chris.powers:3214 to 3215) WL#4896 List-Archive: http://lists.mysql.com/commits/126443 Message-Id: <20101209155021.0F4171DB0329@xeno.mysql.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6399331277775286038==" --===============6399331277775286038== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline 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 3214 Christopher Powers 2010-12-08 WL#4896 Performance schema Net IO Cleaning up PB2... modified: mysql-test/suite/perfschema/t/disabled.def 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; + --===============6399331277775286038== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/chris.powers@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: chris.powers@stripped # target_branch: file:///home/cpowers/work/dev/mysql-trunk-wl4896/ # testament_sha1: 674a65ae9dd9dd493c5769113cacf72ab184f8e7 # timestamp: 2010-12-09 09:50:20 -0600 # base_revision_id: chris.powers@stripped\ # caqbv3n9sjmkxqeo # # Begin bundle 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 Nu2XNaNjc2IyvueXOC47uXe3+Zk3PIbnkZOOtw6tu3/I7X0Q8jcydOd/rMnofQ8XQvk2FSj6WLFF 7YZL1wsvPIYvetkvb1mDxahizalLClkHaZU3e16l72vgR5Gx3s9Kr66P75vHxutb0PZ6HR8R5A9S d1OdVtGyRRPF3kjo9bd6PW3H3PPpevWDRe03PZXrec8jUP0XXPd/x3eat/J+fsbt7w7+2s/4syDo gfW/J1dr6Hv/6TcO+G/GVZHzNfc72tXqt0TAbEifXxwb0+lE3McHnKoqhQnn4WDOW4D87z40Ug4K kHya5MZHi1QavO1qGMng9LuexqeZ3sMGCyz3Yvip8mLk9bP4/H46Q7+UPmPtHcNvps6d5Es0vFke VC93JixuGjKcRd0Je1I/VPuNjqbE8ju8R6HdtL/Ohi2PvWQ5XvVyZSSTs1j3mbsk1tS5Q3Zwn9fu d8TBO/JxiR4pen8xds/Jy+MFZM97nIzXjzic3mZMn4ql/lLHvkcrDfnJZ+vq8ceiNikpUKFH3EZI +KcYTi8ZFuZgnxXOR9fg1jV9ljzdPaRa4e4WSDySPxxI4D4mw7xsUODbZNxu374y5YGJdPvcEHST W1zaT2uYsxRLDYlC4ns2BYNlJk6iy7F32mv2EWeo1TUZOrIbuO81HqxFpPg+AsZroXQlC5bXJJPJ ETz7lpFJ5Ukl7NkRnZlueP+TX2GeMNTJsWWbBf9f01dfqbFGpczXRLV2NxaSL282ihifgZpEsUqR qTHKkuRZUmmGHYRoxf/lGtuZ6Dzta0Sqka2K6e7r7Xz8CPOkHe7tZoj8jBek8kibCaKiT8NHBqLG XqXWy+pqetemDo4vmiZyOK4D1XTtPzanrLq/w/7cH7HUsj4a4T0/IdZwy5+6hSKuhunc+FKpTv/x IoxLlrpFFx7mPf8KqqKqqqi2o3xlCew4ak22yXKNz2H3HS6LiPpPURzyHsophThOVo+gj8TGIXJq T4+dq4FGLEWcB5D1LpDsHTwxhkkTcK8TIRb1HH0O1E728DFj4JvAwTkI5DEXRDDEELgwQxMqwKC2 dggkDhJItKWCKqqwglTSRJvFsBF0W1VVFRVEmAhIlVdwgG3FpMiRjC0QJl6k3FO52B11kmg9h3GA w2UNY4MmA5k4tBhRSKMR+RsHI+yk02TFBVSLUWVEssefg8I2pzokoiyzm3cZFGL+bIX9rF4vAaqH TLk1qWjBRcZnTvqtG8vMZu+9vaXySZMBq9QXra2xS+zC87OjvbbBWayRTXr4c1xMGpJpKKp2bguq QysjV4ppcoy+yqnxe9Orx4D7Pk1tFaD0tjcxYnFdWPK8uZD2rlC5J5xQqYHJza5gvkuk2D5Wkega DxeCZu0i9E3rnqUpTCjvntLNqa3XC5JJ6aYmEG5hJi3ubsua3esXOMnHcwdY4vQOGqTrDh1+p/8L uSKcKEh3dryNAA== --===============6399331277775286038==--