#At file:///Users/malff/BZR_TREE/mysql-trunk-wl5378/ based on revid:marc.alff@stripped
3350 Marc Alff 2011-05-09
WL#5378 PERFORMANCE SCHEMA SUMMARY BY USER / HOST
Fixed branch name, test cleanup.
added:
mysql-test/suite/sys_vars/r/pfs_accounts_size_basic.result
mysql-test/suite/sys_vars/r/pfs_hosts_size_basic.result
mysql-test/suite/sys_vars/r/pfs_users_size_basic.result
mysql-test/suite/sys_vars/t/pfs_accounts_size_basic-master.opt
mysql-test/suite/sys_vars/t/pfs_accounts_size_basic.test
mysql-test/suite/sys_vars/t/pfs_hosts_size_basic-master.opt
mysql-test/suite/sys_vars/t/pfs_hosts_size_basic.test
mysql-test/suite/sys_vars/t/pfs_users_size_basic-master.opt
mysql-test/suite/sys_vars/t/pfs_users_size_basic.test
modified:
.bzr-mysql/default.conf
mysql-test/r/mysqld--help-notwin.result
mysql-test/r/mysqld--help-win.result
=== modified file '.bzr-mysql/default.conf'
--- a/.bzr-mysql/default.conf 2011-04-29 13:01:39 +0000
+++ b/.bzr-mysql/default.conf 2011-05-09 09:56:21 +0000
@@ -1,4 +1,4 @@
[MYSQL]
post_commit_to = "commits@stripped"
post_push_to = "commits@stripped"
-tree_name = "mysql-trunk"
+tree_name = "mysql-trunk-wl5378"
=== modified file 'mysql-test/r/mysqld--help-notwin.result'
--- a/mysql-test/r/mysqld--help-notwin.result 2011-04-28 08:28:18 +0000
+++ b/mysql-test/r/mysqld--help-notwin.result 2011-05-09 09:56:21 +0000
@@ -426,6 +426,8 @@ The following options may be given as th
mrr_cost_based} and val is one of {on, off, default}
--performance-schema
Enable the performance schema.
+ --performance-schema-accounts-size=#
+ Maximum number of instrumented user@host accounts.
--performance-schema-events-stages-history-long-size=#
Number of rows in EVENTS_STAGES_HISTORY_LONG.
--performance-schema-events-stages-history-size=#
@@ -438,6 +440,8 @@ The following options may be given as th
Number of rows in EVENTS_WAITS_HISTORY_LONG.
--performance-schema-events-waits-history-size=#
Number of rows per thread in EVENTS_WAITS_HISTORY.
+ --performance-schema-hosts-size=#
+ Maximum number of instrumented hosts.
--performance-schema-max-cond-classes=#
Maximum number of condition instruments.
--performance-schema-max-cond-instances=#
@@ -472,6 +476,8 @@ The following options may be given as th
Maximum number of rows in SETUP_ACTORS.
--performance-schema-setup-objects-size=#
Maximum number of rows in SETUP_OBJECTS.
+ --performance-schema-users-size=#
+ Maximum number of instrumented users.
--pid-file=name Pid file used by safe_mysqld
--plugin-dir=name Directory for plugins
--plugin-load=name Optional semicolon-separated list of plugins to load,
@@ -896,12 +902,14 @@ optimizer-prune-level 1
optimizer-search-depth 62
optimizer-switch index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=on
performance-schema FALSE
+performance-schema-accounts-size 100
performance-schema-events-stages-history-long-size 10000
performance-schema-events-stages-history-size 10
performance-schema-events-statements-history-long-size 10000
performance-schema-events-statements-history-size 10
performance-schema-events-waits-history-long-size 10000
performance-schema-events-waits-history-size 10
+performance-schema-hosts-size 100
performance-schema-max-cond-classes 80
performance-schema-max-cond-instances 1000
performance-schema-max-file-classes 50
@@ -919,6 +927,7 @@ performance-schema-max-thread-classes 50
performance-schema-max-thread-instances 1000
performance-schema-setup-actors-size 100
performance-schema-setup-objects-size 100
+performance-schema-users-size 100
plugin-load (No default value)
port 3306
port-open-timeout 0
=== modified file 'mysql-test/r/mysqld--help-win.result'
--- a/mysql-test/r/mysqld--help-win.result 2011-04-28 08:28:18 +0000
+++ b/mysql-test/r/mysqld--help-win.result 2011-05-09 09:56:21 +0000
@@ -426,6 +426,8 @@ The following options may be given as th
mrr_cost_based} and val is one of {on, off, default}
--performance-schema
Enable the performance schema.
+ --performance-schema-accounts-size=#
+ Maximum number of instrumented user@host accounts.
--performance-schema-events-stages-history-long-size=#
Number of rows in EVENTS_STAGES_HISTORY_LONG.
--performance-schema-events-stages-history-size=#
@@ -438,6 +440,8 @@ The following options may be given as th
Number of rows in EVENTS_WAITS_HISTORY_LONG.
--performance-schema-events-waits-history-size=#
Number of rows per thread in EVENTS_WAITS_HISTORY.
+ --performance-schema-hosts-size=#
+ Maximum number of instrumented hosts.
--performance-schema-max-cond-classes=#
Maximum number of condition instruments.
--performance-schema-max-cond-instances=#
@@ -472,6 +476,8 @@ The following options may be given as th
Maximum number of rows in SETUP_ACTORS.
--performance-schema-setup-objects-size=#
Maximum number of rows in SETUP_OBJECTS.
+ --performance-schema-users-size=#
+ Maximum number of instrumented users.
--pid-file=name Pid file used by safe_mysqld
--plugin-dir=name Directory for plugins
--plugin-load=name Optional semicolon-separated list of plugins to load,
@@ -900,12 +906,14 @@ optimizer-prune-level 1
optimizer-search-depth 62
optimizer-switch index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=on
performance-schema FALSE
+performance-schema-accounts-size 100
performance-schema-events-stages-history-long-size 10000
performance-schema-events-stages-history-size 10
performance-schema-events-statements-history-long-size 10000
performance-schema-events-statements-history-size 10
performance-schema-events-waits-history-long-size 10000
performance-schema-events-waits-history-size 10
+performance-schema-hosts-size 100
performance-schema-max-cond-classes 80
performance-schema-max-cond-instances 1000
performance-schema-max-file-classes 50
@@ -923,6 +931,7 @@ performance-schema-max-thread-classes 50
performance-schema-max-thread-instances 1000
performance-schema-setup-actors-size 100
performance-schema-setup-objects-size 100
+performance-schema-users-size 100
plugin-load (No default value)
port 3306
port-open-timeout 0
=== added file 'mysql-test/suite/sys_vars/r/pfs_accounts_size_basic.result'
--- a/mysql-test/suite/sys_vars/r/pfs_accounts_size_basic.result 1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/sys_vars/r/pfs_accounts_size_basic.result 2011-05-09 09:56:21 +0000
@@ -0,0 +1,23 @@
+select @@global.performance_schema_accounts_size;
+@@global.performance_schema_accounts_size
+123
+select @@session.performance_schema_accounts_size;
+ERROR HY000: Variable 'performance_schema_accounts_size' is a GLOBAL variable
+show global variables like 'performance_schema_accounts_size';
+Variable_name Value
+performance_schema_accounts_size 123
+show session variables like 'performance_schema_accounts_size';
+Variable_name Value
+performance_schema_accounts_size 123
+select * from information_schema.global_variables
+where variable_name='performance_schema_accounts_size';
+VARIABLE_NAME VARIABLE_VALUE
+PERFORMANCE_SCHEMA_ACCOUNTS_SIZE 123
+select * from information_schema.session_variables
+where variable_name='performance_schema_accounts_size';
+VARIABLE_NAME VARIABLE_VALUE
+PERFORMANCE_SCHEMA_ACCOUNTS_SIZE 123
+set global performance_schema_accounts_size=1;
+ERROR HY000: Variable 'performance_schema_accounts_size' is a read only variable
+set session performance_schema_accounts_size=1;
+ERROR HY000: Variable 'performance_schema_accounts_size' is a read only variable
=== added file 'mysql-test/suite/sys_vars/r/pfs_hosts_size_basic.result'
--- a/mysql-test/suite/sys_vars/r/pfs_hosts_size_basic.result 1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/sys_vars/r/pfs_hosts_size_basic.result 2011-05-09 09:56:21 +0000
@@ -0,0 +1,23 @@
+select @@global.performance_schema_hosts_size;
+@@global.performance_schema_hosts_size
+123
+select @@session.performance_schema_hosts_size;
+ERROR HY000: Variable 'performance_schema_hosts_size' is a GLOBAL variable
+show global variables like 'performance_schema_hosts_size';
+Variable_name Value
+performance_schema_hosts_size 123
+show session variables like 'performance_schema_hosts_size';
+Variable_name Value
+performance_schema_hosts_size 123
+select * from information_schema.global_variables
+where variable_name='performance_schema_hosts_size';
+VARIABLE_NAME VARIABLE_VALUE
+PERFORMANCE_SCHEMA_HOSTS_SIZE 123
+select * from information_schema.session_variables
+where variable_name='performance_schema_hosts_size';
+VARIABLE_NAME VARIABLE_VALUE
+PERFORMANCE_SCHEMA_HOSTS_SIZE 123
+set global performance_schema_hosts_size=1;
+ERROR HY000: Variable 'performance_schema_hosts_size' is a read only variable
+set session performance_schema_hosts_size=1;
+ERROR HY000: Variable 'performance_schema_hosts_size' is a read only variable
=== added file 'mysql-test/suite/sys_vars/r/pfs_users_size_basic.result'
--- a/mysql-test/suite/sys_vars/r/pfs_users_size_basic.result 1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/sys_vars/r/pfs_users_size_basic.result 2011-05-09 09:56:21 +0000
@@ -0,0 +1,23 @@
+select @@global.performance_schema_users_size;
+@@global.performance_schema_users_size
+123
+select @@session.performance_schema_users_size;
+ERROR HY000: Variable 'performance_schema_users_size' is a GLOBAL variable
+show global variables like 'performance_schema_users_size';
+Variable_name Value
+performance_schema_users_size 123
+show session variables like 'performance_schema_users_size';
+Variable_name Value
+performance_schema_users_size 123
+select * from information_schema.global_variables
+where variable_name='performance_schema_users_size';
+VARIABLE_NAME VARIABLE_VALUE
+PERFORMANCE_SCHEMA_USERS_SIZE 123
+select * from information_schema.session_variables
+where variable_name='performance_schema_users_size';
+VARIABLE_NAME VARIABLE_VALUE
+PERFORMANCE_SCHEMA_USERS_SIZE 123
+set global performance_schema_users_size=1;
+ERROR HY000: Variable 'performance_schema_users_size' is a read only variable
+set session performance_schema_users_size=1;
+ERROR HY000: Variable 'performance_schema_users_size' is a read only variable
=== added file 'mysql-test/suite/sys_vars/t/pfs_accounts_size_basic-master.opt'
--- a/mysql-test/suite/sys_vars/t/pfs_accounts_size_basic-master.opt 1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/sys_vars/t/pfs_accounts_size_basic-master.opt 2011-05-09 09:56:21 +0000
@@ -0,0 +1,2 @@
+--loose-enable-performance-schema
+--loose-performance-schema-accounts-size=123
=== added file 'mysql-test/suite/sys_vars/t/pfs_accounts_size_basic.test'
--- a/mysql-test/suite/sys_vars/t/pfs_accounts_size_basic.test 1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/sys_vars/t/pfs_accounts_size_basic.test 2011-05-09 09:56:21 +0000
@@ -0,0 +1,47 @@
+# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+# 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_accounts_size;
+
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+select @@session.performance_schema_accounts_size;
+
+show global variables like 'performance_schema_accounts_size';
+
+show session variables like 'performance_schema_accounts_size';
+
+select * from information_schema.global_variables
+ where variable_name='performance_schema_accounts_size';
+
+select * from information_schema.session_variables
+ where variable_name='performance_schema_accounts_size';
+
+#
+# Read-only
+#
+
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+set global performance_schema_accounts_size=1;
+
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+set session performance_schema_accounts_size=1;
+
=== added file 'mysql-test/suite/sys_vars/t/pfs_hosts_size_basic-master.opt'
--- a/mysql-test/suite/sys_vars/t/pfs_hosts_size_basic-master.opt 1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/sys_vars/t/pfs_hosts_size_basic-master.opt 2011-05-09 09:56:21 +0000
@@ -0,0 +1,2 @@
+--loose-enable-performance-schema
+--loose-performance-schema-hosts-size=123
=== added file 'mysql-test/suite/sys_vars/t/pfs_hosts_size_basic.test'
--- a/mysql-test/suite/sys_vars/t/pfs_hosts_size_basic.test 1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/sys_vars/t/pfs_hosts_size_basic.test 2011-05-09 09:56:21 +0000
@@ -0,0 +1,47 @@
+# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+# 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_hosts_size;
+
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+select @@session.performance_schema_hosts_size;
+
+show global variables like 'performance_schema_hosts_size';
+
+show session variables like 'performance_schema_hosts_size';
+
+select * from information_schema.global_variables
+ where variable_name='performance_schema_hosts_size';
+
+select * from information_schema.session_variables
+ where variable_name='performance_schema_hosts_size';
+
+#
+# Read-only
+#
+
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+set global performance_schema_hosts_size=1;
+
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+set session performance_schema_hosts_size=1;
+
=== added file 'mysql-test/suite/sys_vars/t/pfs_users_size_basic-master.opt'
--- a/mysql-test/suite/sys_vars/t/pfs_users_size_basic-master.opt 1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/sys_vars/t/pfs_users_size_basic-master.opt 2011-05-09 09:56:21 +0000
@@ -0,0 +1,2 @@
+--loose-enable-performance-schema
+--loose-performance-schema-users-size=123
=== added file 'mysql-test/suite/sys_vars/t/pfs_users_size_basic.test'
--- a/mysql-test/suite/sys_vars/t/pfs_users_size_basic.test 1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/sys_vars/t/pfs_users_size_basic.test 2011-05-09 09:56:21 +0000
@@ -0,0 +1,47 @@
+# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+# 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_users_size;
+
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+select @@session.performance_schema_users_size;
+
+show global variables like 'performance_schema_users_size';
+
+show session variables like 'performance_schema_users_size';
+
+select * from information_schema.global_variables
+ where variable_name='performance_schema_users_size';
+
+select * from information_schema.session_variables
+ where variable_name='performance_schema_users_size';
+
+#
+# Read-only
+#
+
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+set global performance_schema_users_size=1;
+
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+set session performance_schema_users_size=1;
+
Attachment: [text/bzr-bundle] bzr/marc.alff@oracle.com-20110509095621-x6knuogkygi5j0jt.bundle
| Thread |
|---|
| • bzr commit into mysql-trunk-wl5378 branch (marc.alff:3350) WL#5378 | Marc Alff | 9 May |
