#At file:///Users/malff/BZR_TREE/mysql-next-mr-wl4674/ based on revid:marc.alff@stripped
3145 Marc Alff 2010-05-14
test cleanup
added:
mysql-test/suite/sys_vars/r/pfs_setup_actors_size_basic.result
mysql-test/suite/sys_vars/t/pfs_setup_actors_size_basic-master.opt
mysql-test/suite/sys_vars/t/pfs_setup_actors_size_basic.test
modified:
mysql-test/suite/perfschema/r/schema_lc1.result
=== modified file 'mysql-test/suite/perfschema/r/schema_lc1.result'
--- a/mysql-test/suite/perfschema/r/schema_lc1.result 2010-05-12 14:04:32 +0000
+++ b/mysql-test/suite/perfschema/r/schema_lc1.result 2010-05-14 14:21:56 +0000
@@ -8,34 +8,34 @@ test
use performance_schema;
show tables;
Tables_in_performance_schema
-COND_INSTANCES
-EVENTS_WAITS_CURRENT
-EVENTS_WAITS_HISTORY
-EVENTS_WAITS_HISTORY_LONG
-EVENTS_WAITS_SUMMARY_BY_EVENT_NAME
-EVENTS_WAITS_SUMMARY_BY_INSTANCE
-EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME
-FILE_INSTANCES
-FILE_SUMMARY_BY_EVENT_NAME
-FILE_SUMMARY_BY_INSTANCE
-MUTEX_INSTANCES
-PERFORMANCE_TIMERS
-RWLOCK_INSTANCES
-SETUP_ACTORS
-SETUP_CONSUMERS
-SETUP_INSTRUMENTS
-SETUP_OBJECTS
-SETUP_TIMERS
-THREADS
+cond_instances
+events_waits_current
+events_waits_history
+events_waits_history_long
+events_waits_summary_by_event_name
+events_waits_summary_by_instance
+events_waits_summary_by_thread_by_event_name
+file_instances
+file_summary_by_event_name
+file_summary_by_instance
+mutex_instances
+performance_timers
+rwlock_instances
+setup_actors
+setup_consumers
+setup_instruments
+setup_objects
+setup_timers
+threads
show create table COND_INSTANCES;
Table Create Table
-COND_INSTANCES CREATE TABLE `COND_INSTANCES` (
+COND_INSTANCES CREATE TABLE `cond_instances` (
`NAME` varchar(128) NOT NULL,
`OBJECT_INSTANCE_BEGIN` bigint(20) NOT NULL
) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
show create table EVENTS_WAITS_CURRENT;
Table Create Table
-EVENTS_WAITS_CURRENT CREATE TABLE `EVENTS_WAITS_CURRENT` (
+EVENTS_WAITS_CURRENT CREATE TABLE `events_waits_current` (
`THREAD_ID` int(11) NOT NULL,
`EVENT_ID` bigint(20) unsigned NOT NULL,
`EVENT_NAME` varchar(128) NOT NULL,
@@ -55,7 +55,7 @@ EVENTS_WAITS_CURRENT CREATE TABLE `EVENT
) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
show create table EVENTS_WAITS_HISTORY;
Table Create Table
-EVENTS_WAITS_HISTORY CREATE TABLE `EVENTS_WAITS_HISTORY` (
+EVENTS_WAITS_HISTORY CREATE TABLE `events_waits_history` (
`THREAD_ID` int(11) NOT NULL,
`EVENT_ID` bigint(20) unsigned NOT NULL,
`EVENT_NAME` varchar(128) NOT NULL,
@@ -75,7 +75,7 @@ EVENTS_WAITS_HISTORY CREATE TABLE `EVENT
) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
show create table EVENTS_WAITS_HISTORY_LONG;
Table Create Table
-EVENTS_WAITS_HISTORY_LONG CREATE TABLE `EVENTS_WAITS_HISTORY_LONG` (
+EVENTS_WAITS_HISTORY_LONG CREATE TABLE `events_waits_history_long` (
`THREAD_ID` int(11) NOT NULL,
`EVENT_ID` bigint(20) unsigned NOT NULL,
`EVENT_NAME` varchar(128) NOT NULL,
@@ -95,7 +95,7 @@ EVENTS_WAITS_HISTORY_LONG CREATE TABLE `
) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
show create table EVENTS_WAITS_SUMMARY_BY_EVENT_NAME;
Table Create Table
-EVENTS_WAITS_SUMMARY_BY_EVENT_NAME CREATE TABLE `EVENTS_WAITS_SUMMARY_BY_EVENT_NAME` (
+EVENTS_WAITS_SUMMARY_BY_EVENT_NAME CREATE TABLE `events_waits_summary_by_event_name` (
`EVENT_NAME` varchar(128) NOT NULL,
`COUNT_STAR` bigint(20) unsigned NOT NULL,
`SUM_TIMER_WAIT` bigint(20) unsigned NOT NULL,
@@ -105,7 +105,7 @@ EVENTS_WAITS_SUMMARY_BY_EVENT_NAME CREAT
) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
show create table EVENTS_WAITS_SUMMARY_BY_INSTANCE;
Table Create Table
-EVENTS_WAITS_SUMMARY_BY_INSTANCE CREATE TABLE `EVENTS_WAITS_SUMMARY_BY_INSTANCE` (
+EVENTS_WAITS_SUMMARY_BY_INSTANCE CREATE TABLE `events_waits_summary_by_instance` (
`EVENT_NAME` varchar(128) NOT NULL,
`OBJECT_INSTANCE_BEGIN` bigint(20) NOT NULL,
`COUNT_STAR` bigint(20) unsigned NOT NULL,
@@ -116,7 +116,7 @@ EVENTS_WAITS_SUMMARY_BY_INSTANCE CREATE
) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
show create table EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME;
Table Create Table
-EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME CREATE TABLE `EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME` (
+EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME CREATE TABLE `events_waits_summary_by_thread_by_event_name` (
`THREAD_ID` int(11) NOT NULL,
`EVENT_NAME` varchar(128) NOT NULL,
`COUNT_STAR` bigint(20) unsigned NOT NULL,
@@ -127,14 +127,14 @@ EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_
) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
show create table FILE_INSTANCES;
Table Create Table
-FILE_INSTANCES CREATE TABLE `FILE_INSTANCES` (
+FILE_INSTANCES CREATE TABLE `file_instances` (
`FILE_NAME` varchar(512) NOT NULL,
`EVENT_NAME` varchar(128) NOT NULL,
`OPEN_COUNT` int(10) unsigned NOT NULL
) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
show create table FILE_SUMMARY_BY_EVENT_NAME;
Table Create Table
-FILE_SUMMARY_BY_EVENT_NAME CREATE TABLE `FILE_SUMMARY_BY_EVENT_NAME` (
+FILE_SUMMARY_BY_EVENT_NAME CREATE TABLE `file_summary_by_event_name` (
`EVENT_NAME` varchar(128) NOT NULL,
`COUNT_READ` bigint(20) unsigned NOT NULL,
`COUNT_WRITE` bigint(20) unsigned NOT NULL,
@@ -143,7 +143,7 @@ FILE_SUMMARY_BY_EVENT_NAME CREATE TABLE
) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
show create table FILE_SUMMARY_BY_INSTANCE;
Table Create Table
-FILE_SUMMARY_BY_INSTANCE CREATE TABLE `FILE_SUMMARY_BY_INSTANCE` (
+FILE_SUMMARY_BY_INSTANCE CREATE TABLE `file_summary_by_instance` (
`FILE_NAME` varchar(512) NOT NULL,
`EVENT_NAME` varchar(128) NOT NULL,
`COUNT_READ` bigint(20) unsigned NOT NULL,
@@ -153,14 +153,14 @@ FILE_SUMMARY_BY_INSTANCE CREATE TABLE `F
) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
show create table MUTEX_INSTANCES;
Table Create Table
-MUTEX_INSTANCES CREATE TABLE `MUTEX_INSTANCES` (
+MUTEX_INSTANCES CREATE TABLE `mutex_instances` (
`NAME` varchar(128) NOT NULL,
`OBJECT_INSTANCE_BEGIN` bigint(20) NOT NULL,
`LOCKED_BY_THREAD_ID` int(11) DEFAULT NULL
) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
show create table PERFORMANCE_TIMERS;
Table Create Table
-PERFORMANCE_TIMERS CREATE TABLE `PERFORMANCE_TIMERS` (
+PERFORMANCE_TIMERS CREATE TABLE `performance_timers` (
`TIMER_NAME` enum('CYCLE','NANOSECOND','MICROSECOND','MILLISECOND','TICK') NOT NULL,
`TIMER_FREQUENCY` bigint(20) DEFAULT NULL,
`TIMER_RESOLUTION` bigint(20) DEFAULT NULL,
@@ -168,7 +168,7 @@ PERFORMANCE_TIMERS CREATE TABLE `PERFORM
) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
show create table RWLOCK_INSTANCES;
Table Create Table
-RWLOCK_INSTANCES CREATE TABLE `RWLOCK_INSTANCES` (
+RWLOCK_INSTANCES CREATE TABLE `rwlock_instances` (
`NAME` varchar(128) NOT NULL,
`OBJECT_INSTANCE_BEGIN` bigint(20) NOT NULL,
`WRITE_LOCKED_BY_THREAD_ID` int(11) DEFAULT NULL,
@@ -176,27 +176,27 @@ RWLOCK_INSTANCES CREATE TABLE `RWLOCK_IN
) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
show create table SETUP_ACTORS;
Table Create Table
-SETUP_ACTORS CREATE TABLE `SETUP_ACTORS` (
+SETUP_ACTORS CREATE TABLE `setup_actors` (
`HOST` char(60) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '%',
`USER` char(16) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '%',
`ROLE` char(16) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '%'
) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
show create table SETUP_CONSUMERS;
Table Create Table
-SETUP_CONSUMERS CREATE TABLE `SETUP_CONSUMERS` (
+SETUP_CONSUMERS CREATE TABLE `setup_consumers` (
`NAME` varchar(64) NOT NULL,
`ENABLED` enum('YES','NO') NOT NULL
) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
show create table SETUP_INSTRUMENTS;
Table Create Table
-SETUP_INSTRUMENTS CREATE TABLE `SETUP_INSTRUMENTS` (
+SETUP_INSTRUMENTS CREATE TABLE `setup_instruments` (
`NAME` varchar(128) NOT NULL,
`ENABLED` enum('YES','NO') NOT NULL,
`TIMED` enum('YES','NO') NOT NULL
) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
show create table SETUP_OBJECTS;
Table Create Table
-SETUP_OBJECTS CREATE TABLE `SETUP_OBJECTS` (
+SETUP_OBJECTS CREATE TABLE `setup_objects` (
`OBJECT_TYPE` varchar(64) DEFAULT NULL,
`OBJECT_SCHEMA` varchar(64) DEFAULT NULL,
`OBJECT_NAME` varchar(64) DEFAULT NULL,
@@ -206,13 +206,13 @@ SETUP_OBJECTS CREATE TABLE `SETUP_OBJECT
) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
show create table SETUP_TIMERS;
Table Create Table
-SETUP_TIMERS CREATE TABLE `SETUP_TIMERS` (
+SETUP_TIMERS CREATE TABLE `setup_timers` (
`NAME` varchar(64) NOT NULL,
`TIMER_NAME` enum('CYCLE','NANOSECOND','MICROSECOND','MILLISECOND','TICK') NOT NULL
) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
show create table THREADS;
Table Create Table
-THREADS CREATE TABLE `THREADS` (
+THREADS CREATE TABLE `threads` (
`THREAD_ID` int(11) NOT NULL,
`NAME` varchar(128) NOT NULL,
`TYPE` varchar(10) NOT NULL,
=== added file 'mysql-test/suite/sys_vars/r/pfs_setup_actors_size_basic.result'
--- a/mysql-test/suite/sys_vars/r/pfs_setup_actors_size_basic.result 1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/sys_vars/r/pfs_setup_actors_size_basic.result 2010-05-14 14:21:56 +0000
@@ -0,0 +1,23 @@
+select @@global.performance_schema_setup_actors_size;
+@@global.performance_schema_setup_actors_size
+123
+select @@session.performance_schema_setup_actors_size;
+ERROR HY000: Variable 'performance_schema_setup_actors_size' is a GLOBAL variable
+show global variables like 'performance_schema_setup_actors_size';
+Variable_name Value
+performance_schema_setup_actors_size 123
+show session variables like 'performance_schema_setup_actors_size';
+Variable_name Value
+performance_schema_setup_actors_size 123
+select * from information_schema.global_variables
+where variable_name='performance_schema_setup_actors_size';
+VARIABLE_NAME VARIABLE_VALUE
+PERFORMANCE_SCHEMA_SETUP_ACTORS_SIZE 123
+select * from information_schema.session_variables
+where variable_name='performance_schema_setup_actors_size';
+VARIABLE_NAME VARIABLE_VALUE
+PERFORMANCE_SCHEMA_SETUP_ACTORS_SIZE 123
+set global performance_schema_setup_actors_size=1;
+ERROR HY000: Variable 'performance_schema_setup_actors_size' is a read only variable
+set session performance_schema_setup_actors_size=1;
+ERROR HY000: Variable 'performance_schema_setup_actors_size' is a read only variable
=== added file 'mysql-test/suite/sys_vars/t/pfs_setup_actors_size_basic-master.opt'
--- a/mysql-test/suite/sys_vars/t/pfs_setup_actors_size_basic-master.opt 1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/sys_vars/t/pfs_setup_actors_size_basic-master.opt 2010-05-14 14:21:56 +0000
@@ -0,0 +1,2 @@
+--loose-enable-performance-schema
+--loose-performance-schema-setup-actors-size=123
=== added file 'mysql-test/suite/sys_vars/t/pfs_setup_actors_size_basic.test'
--- a/mysql-test/suite/sys_vars/t/pfs_setup_actors_size_basic.test 1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/sys_vars/t/pfs_setup_actors_size_basic.test 2010-05-14 14:21:56 +0000
@@ -0,0 +1,47 @@
+# Copyright (c) 2010, 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_setup_actors_size;
+
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+select @@session.performance_schema_setup_actors_size;
+
+show global variables like 'performance_schema_setup_actors_size';
+
+show session variables like 'performance_schema_setup_actors_size';
+
+select * from information_schema.global_variables
+ where variable_name='performance_schema_setup_actors_size';
+
+select * from information_schema.session_variables
+ where variable_name='performance_schema_setup_actors_size';
+
+#
+# Read-only
+#
+
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+set global performance_schema_setup_actors_size=1;
+
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+set session performance_schema_setup_actors_size=1;
+
Attachment: [text/bzr-bundle] bzr/marc.alff@oracle.com-20100514142156-6amfjlg1ooheaqap.bundle
| Thread |
|---|
| • bzr commit into mysql-next-mr branch (marc.alff:3145) | Marc Alff | 14 May |
