#At file:///Users/malff/BZR_TREE/mysql-next-mr-wl4674/ based on revid:marc.alff@stripped
3170 Marc Alff 2010-09-01
Fixed the tests for lc1 and lc2 platforms
modified:
mysql-test/suite/perfschema/r/pfs_upgrade_lc1.result
mysql-test/suite/perfschema/r/pfs_upgrade_lc2.result
mysql-test/suite/perfschema/r/schema_lc1.result
mysql-test/suite/perfschema/r/schema_lc2.result
mysql-test/suite/perfschema/t/setup_actors.test
=== modified file 'mysql-test/suite/perfschema/r/pfs_upgrade_lc1.result'
--- a/mysql-test/suite/perfschema/r/pfs_upgrade_lc1.result 2010-08-12 15:25:01 +0000
+++ b/mysql-test/suite/perfschema/r/pfs_upgrade_lc1.result 2010-09-02 00:00:20 +0000
@@ -21,11 +21,12 @@ ERROR 1050 (42S01) at line 203: Table 'f
ERROR 1050 (42S01) at line 212: Table 'mutex_instances' already exists
ERROR 1050 (42S01) at line 222: Table 'performance_timers' already exists
ERROR 1050 (42S01) at line 232: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 240: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 249: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 257: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 266: Table 'threads' already exists
-ERROR 1644 (HY000) at line 682: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 242: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 250: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 259: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 267: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 287: Table 'threads' already exists
+ERROR 1644 (HY000) at line 703: Unexpected content found in the performance_schema database.
FATAL ERROR: Upgrade failed
show tables like "user_table";
Tables_in_performance_schema (user_table)
@@ -51,11 +52,12 @@ ERROR 1050 (42S01) at line 203: Table 'f
ERROR 1050 (42S01) at line 212: Table 'mutex_instances' already exists
ERROR 1050 (42S01) at line 222: Table 'performance_timers' already exists
ERROR 1050 (42S01) at line 232: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 240: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 249: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 257: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 266: Table 'threads' already exists
-ERROR 1644 (HY000) at line 682: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 242: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 250: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 259: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 267: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 287: Table 'threads' already exists
+ERROR 1644 (HY000) at line 703: Unexpected content found in the performance_schema database.
FATAL ERROR: Upgrade failed
show tables like "user_view";
Tables_in_performance_schema (user_view)
@@ -79,11 +81,12 @@ ERROR 1050 (42S01) at line 203: Table 'f
ERROR 1050 (42S01) at line 212: Table 'mutex_instances' already exists
ERROR 1050 (42S01) at line 222: Table 'performance_timers' already exists
ERROR 1050 (42S01) at line 232: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 240: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 249: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 257: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 266: Table 'threads' already exists
-ERROR 1644 (HY000) at line 682: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 242: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 250: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 259: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 267: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 287: Table 'threads' already exists
+ERROR 1644 (HY000) at line 703: Unexpected content found in the performance_schema database.
FATAL ERROR: Upgrade failed
select name from mysql.proc where db='performance_schema';
name
@@ -107,11 +110,12 @@ ERROR 1050 (42S01) at line 203: Table 'f
ERROR 1050 (42S01) at line 212: Table 'mutex_instances' already exists
ERROR 1050 (42S01) at line 222: Table 'performance_timers' already exists
ERROR 1050 (42S01) at line 232: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 240: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 249: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 257: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 266: Table 'threads' already exists
-ERROR 1644 (HY000) at line 682: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 242: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 250: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 259: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 267: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 287: Table 'threads' already exists
+ERROR 1644 (HY000) at line 703: Unexpected content found in the performance_schema database.
FATAL ERROR: Upgrade failed
select name from mysql.proc where db='performance_schema';
name
@@ -135,11 +139,12 @@ ERROR 1050 (42S01) at line 203: Table 'f
ERROR 1050 (42S01) at line 212: Table 'mutex_instances' already exists
ERROR 1050 (42S01) at line 222: Table 'performance_timers' already exists
ERROR 1050 (42S01) at line 232: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 240: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 249: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 257: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 266: Table 'threads' already exists
-ERROR 1644 (HY000) at line 682: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 242: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 250: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 259: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 267: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 287: Table 'threads' already exists
+ERROR 1644 (HY000) at line 703: Unexpected content found in the performance_schema database.
FATAL ERROR: Upgrade failed
select name from mysql.event where db='performance_schema';
name
=== modified file 'mysql-test/suite/perfschema/r/pfs_upgrade_lc2.result'
--- a/mysql-test/suite/perfschema/r/pfs_upgrade_lc2.result 2010-09-01 22:59:33 +0000
+++ b/mysql-test/suite/perfschema/r/pfs_upgrade_lc2.result 2010-09-02 00:00:20 +0000
@@ -21,21 +21,12 @@ ERROR 1050 (42S01) at line 203: Table 'f
ERROR 1050 (42S01) at line 212: Table 'mutex_instances' already exists
ERROR 1050 (42S01) at line 222: Table 'performance_timers' already exists
ERROR 1050 (42S01) at line 232: Table 'rwlock_instances' already exists
-<<<<<<< TREE
ERROR 1050 (42S01) at line 242: Table 'setup_actors' already exists
ERROR 1050 (42S01) at line 250: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 262: Table 'setup_objects' already exists
-ERROR 1050 (42S01) at line 271: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 279: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 299: Table 'threads' already exists
-ERROR 1644 (HY000) at line 715: Unexpected content found in the performance_schema database.
-=======
-ERROR 1050 (42S01) at line 240: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 249: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 257: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 266: Table 'threads' already exists
-ERROR 1644 (HY000) at line 682: Unexpected content found in the performance_schema database.
->>>>>>> MERGE-SOURCE
+ERROR 1050 (42S01) at line 259: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 267: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 287: Table 'threads' already exists
+ERROR 1644 (HY000) at line 703: Unexpected content found in the performance_schema database.
FATAL ERROR: Upgrade failed
show tables like "user_table";
Tables_in_performance_schema (user_table)
@@ -61,21 +52,12 @@ ERROR 1050 (42S01) at line 203: Table 'f
ERROR 1050 (42S01) at line 212: Table 'mutex_instances' already exists
ERROR 1050 (42S01) at line 222: Table 'performance_timers' already exists
ERROR 1050 (42S01) at line 232: Table 'rwlock_instances' already exists
-<<<<<<< TREE
ERROR 1050 (42S01) at line 242: Table 'setup_actors' already exists
ERROR 1050 (42S01) at line 250: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 262: Table 'setup_objects' already exists
-ERROR 1050 (42S01) at line 271: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 279: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 299: Table 'threads' already exists
-ERROR 1644 (HY000) at line 715: Unexpected content found in the performance_schema database.
-=======
-ERROR 1050 (42S01) at line 240: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 249: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 257: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 266: Table 'threads' already exists
-ERROR 1644 (HY000) at line 682: Unexpected content found in the performance_schema database.
->>>>>>> MERGE-SOURCE
+ERROR 1050 (42S01) at line 259: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 267: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 287: Table 'threads' already exists
+ERROR 1644 (HY000) at line 703: Unexpected content found in the performance_schema database.
FATAL ERROR: Upgrade failed
show tables like "user_view";
Tables_in_performance_schema (user_view)
@@ -99,21 +81,12 @@ ERROR 1050 (42S01) at line 203: Table 'f
ERROR 1050 (42S01) at line 212: Table 'mutex_instances' already exists
ERROR 1050 (42S01) at line 222: Table 'performance_timers' already exists
ERROR 1050 (42S01) at line 232: Table 'rwlock_instances' already exists
-<<<<<<< TREE
ERROR 1050 (42S01) at line 242: Table 'setup_actors' already exists
ERROR 1050 (42S01) at line 250: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 262: Table 'setup_objects' already exists
-ERROR 1050 (42S01) at line 271: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 279: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 299: Table 'threads' already exists
-ERROR 1644 (HY000) at line 715: Unexpected content found in the performance_schema database.
-=======
-ERROR 1050 (42S01) at line 240: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 249: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 257: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 266: Table 'threads' already exists
-ERROR 1644 (HY000) at line 682: Unexpected content found in the performance_schema database.
->>>>>>> MERGE-SOURCE
+ERROR 1050 (42S01) at line 259: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 267: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 287: Table 'threads' already exists
+ERROR 1644 (HY000) at line 703: Unexpected content found in the performance_schema database.
FATAL ERROR: Upgrade failed
select name from mysql.proc where db='performance_schema';
name
@@ -137,21 +110,12 @@ ERROR 1050 (42S01) at line 203: Table 'f
ERROR 1050 (42S01) at line 212: Table 'mutex_instances' already exists
ERROR 1050 (42S01) at line 222: Table 'performance_timers' already exists
ERROR 1050 (42S01) at line 232: Table 'rwlock_instances' already exists
-<<<<<<< TREE
ERROR 1050 (42S01) at line 242: Table 'setup_actors' already exists
ERROR 1050 (42S01) at line 250: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 262: Table 'setup_objects' already exists
-ERROR 1050 (42S01) at line 271: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 279: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 299: Table 'threads' already exists
-ERROR 1644 (HY000) at line 715: Unexpected content found in the performance_schema database.
-=======
-ERROR 1050 (42S01) at line 240: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 249: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 257: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 266: Table 'threads' already exists
-ERROR 1644 (HY000) at line 682: Unexpected content found in the performance_schema database.
->>>>>>> MERGE-SOURCE
+ERROR 1050 (42S01) at line 259: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 267: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 287: Table 'threads' already exists
+ERROR 1644 (HY000) at line 703: Unexpected content found in the performance_schema database.
FATAL ERROR: Upgrade failed
select name from mysql.proc where db='performance_schema';
name
@@ -175,21 +139,12 @@ ERROR 1050 (42S01) at line 203: Table 'f
ERROR 1050 (42S01) at line 212: Table 'mutex_instances' already exists
ERROR 1050 (42S01) at line 222: Table 'performance_timers' already exists
ERROR 1050 (42S01) at line 232: Table 'rwlock_instances' already exists
-<<<<<<< TREE
ERROR 1050 (42S01) at line 242: Table 'setup_actors' already exists
ERROR 1050 (42S01) at line 250: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 262: Table 'setup_objects' already exists
-ERROR 1050 (42S01) at line 271: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 279: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 299: Table 'threads' already exists
-ERROR 1644 (HY000) at line 715: Unexpected content found in the performance_schema database.
-=======
-ERROR 1050 (42S01) at line 240: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 249: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 257: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 266: Table 'threads' already exists
-ERROR 1644 (HY000) at line 682: Unexpected content found in the performance_schema database.
->>>>>>> MERGE-SOURCE
+ERROR 1050 (42S01) at line 259: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 267: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 287: Table 'threads' already exists
+ERROR 1644 (HY000) at line 703: Unexpected content found in the performance_schema database.
FATAL ERROR: Upgrade failed
select name from mysql.event where db='performance_schema';
name
=== modified file 'mysql-test/suite/perfschema/r/schema_lc1.result'
--- a/mysql-test/suite/perfschema/r/schema_lc1.result 2010-07-29 18:00:27 +0000
+++ b/mysql-test/suite/perfschema/r/schema_lc1.result 2010-09-02 00:00:20 +0000
@@ -11,9 +11,9 @@ 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
+events_waits_summary_global_by_event_name
file_instances
file_summary_by_event_name
file_summary_by_instance
@@ -23,7 +23,6 @@ rwlock_instances
setup_actors
setup_consumers
setup_instruments
-setup_objects
setup_timers
threads
show create table COND_INSTANCES;
@@ -92,31 +91,31 @@ EVENTS_WAITS_HISTORY_LONG CREATE TABLE `
`NUMBER_OF_BYTES` bigint(20) unsigned DEFAULT NULL,
`FLAGS` int(10) unsigned DEFAULT NULL
) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
-show create table EVENTS_WAITS_SUMMARY_BY_EVENT_NAME;
+show create table EVENTS_WAITS_SUMMARY_BY_INSTANCE;
Table Create Table
-EVENTS_WAITS_SUMMARY_BY_EVENT_NAME CREATE TABLE `events_waits_summary_by_event_name` (
+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,
`SUM_TIMER_WAIT` bigint(20) unsigned NOT NULL,
`MIN_TIMER_WAIT` bigint(20) unsigned NOT NULL,
`AVG_TIMER_WAIT` bigint(20) unsigned NOT NULL,
`MAX_TIMER_WAIT` bigint(20) unsigned NOT NULL
) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
-show create table EVENTS_WAITS_SUMMARY_BY_INSTANCE;
+show create table EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME;
Table Create Table
-EVENTS_WAITS_SUMMARY_BY_INSTANCE CREATE TABLE `events_waits_summary_by_instance` (
+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,
- `OBJECT_INSTANCE_BEGIN` bigint(20) NOT NULL,
`COUNT_STAR` bigint(20) unsigned NOT NULL,
`SUM_TIMER_WAIT` bigint(20) unsigned NOT NULL,
`MIN_TIMER_WAIT` bigint(20) unsigned NOT NULL,
`AVG_TIMER_WAIT` bigint(20) unsigned NOT NULL,
`MAX_TIMER_WAIT` bigint(20) unsigned NOT NULL
) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
-show create table EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME;
+show create table EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME;
Table Create Table
-EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME CREATE TABLE `events_waits_summary_by_thread_by_event_name` (
- `THREAD_ID` int(11) NOT NULL,
+EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME CREATE TABLE `events_waits_summary_global_by_event_name` (
`EVENT_NAME` varchar(128) NOT NULL,
`COUNT_STAR` bigint(20) unsigned NOT NULL,
`SUM_TIMER_WAIT` bigint(20) unsigned NOT NULL,
@@ -193,16 +192,6 @@ SETUP_INSTRUMENTS CREATE TABLE `setup_in
`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` (
- `OBJECT_TYPE` varchar(64) DEFAULT NULL,
- `OBJECT_SCHEMA` varchar(64) DEFAULT NULL,
- `OBJECT_NAME` varchar(64) DEFAULT NULL,
- `ENABLED` enum('YES','NO') NOT NULL,
- `TIMED` enum('YES','NO') NOT NULL,
- `AGGREGATED` enum('YES','NO') NOT NULL
-) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
show create table SETUP_TIMERS;
Table Create Table
SETUP_TIMERS CREATE TABLE `setup_timers` (
=== modified file 'mysql-test/suite/perfschema/r/schema_lc2.result'
--- a/mysql-test/suite/perfschema/r/schema_lc2.result 2010-07-29 18:00:27 +0000
+++ b/mysql-test/suite/perfschema/r/schema_lc2.result 2010-09-02 00:00:20 +0000
@@ -11,9 +11,9 @@ 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
+EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME
FILE_INSTANCES
FILE_SUMMARY_BY_EVENT_NAME
FILE_SUMMARY_BY_INSTANCE
@@ -23,7 +23,6 @@ RWLOCK_INSTANCES
SETUP_ACTORS
SETUP_CONSUMERS
SETUP_INSTRUMENTS
-SETUP_OBJECTS
SETUP_TIMERS
THREADS
show create table COND_INSTANCES;
@@ -92,31 +91,31 @@ EVENTS_WAITS_HISTORY_LONG CREATE TABLE `
`NUMBER_OF_BYTES` bigint(20) unsigned DEFAULT NULL,
`FLAGS` int(10) unsigned DEFAULT NULL
) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
-show create table EVENTS_WAITS_SUMMARY_BY_EVENT_NAME;
+show create table EVENTS_WAITS_SUMMARY_BY_INSTANCE;
Table Create Table
-EVENTS_WAITS_SUMMARY_BY_EVENT_NAME CREATE TABLE `EVENTS_WAITS_SUMMARY_BY_EVENT_NAME` (
+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,
`SUM_TIMER_WAIT` bigint(20) unsigned NOT NULL,
`MIN_TIMER_WAIT` bigint(20) unsigned NOT NULL,
`AVG_TIMER_WAIT` bigint(20) unsigned NOT NULL,
`MAX_TIMER_WAIT` bigint(20) unsigned NOT NULL
) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
-show create table EVENTS_WAITS_SUMMARY_BY_INSTANCE;
+show create table EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME;
Table Create Table
-EVENTS_WAITS_SUMMARY_BY_INSTANCE CREATE TABLE `EVENTS_WAITS_SUMMARY_BY_INSTANCE` (
+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,
- `OBJECT_INSTANCE_BEGIN` bigint(20) NOT NULL,
`COUNT_STAR` bigint(20) unsigned NOT NULL,
`SUM_TIMER_WAIT` bigint(20) unsigned NOT NULL,
`MIN_TIMER_WAIT` bigint(20) unsigned NOT NULL,
`AVG_TIMER_WAIT` bigint(20) unsigned NOT NULL,
`MAX_TIMER_WAIT` bigint(20) unsigned NOT NULL
) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
-show create table EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME;
+show create table EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME;
Table Create Table
-EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME CREATE TABLE `EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME` (
- `THREAD_ID` int(11) NOT NULL,
+EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME CREATE TABLE `EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME` (
`EVENT_NAME` varchar(128) NOT NULL,
`COUNT_STAR` bigint(20) unsigned NOT NULL,
`SUM_TIMER_WAIT` bigint(20) unsigned NOT NULL,
@@ -193,16 +192,6 @@ SETUP_INSTRUMENTS CREATE TABLE `SETUP_IN
`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` (
- `OBJECT_TYPE` varchar(64) DEFAULT NULL,
- `OBJECT_SCHEMA` varchar(64) DEFAULT NULL,
- `OBJECT_NAME` varchar(64) DEFAULT NULL,
- `ENABLED` enum('YES','NO') NOT NULL,
- `TIMED` enum('YES','NO') NOT NULL,
- `AGGREGATED` enum('YES','NO') NOT NULL
-) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
show create table SETUP_TIMERS;
Table Create Table
SETUP_TIMERS CREATE TABLE `SETUP_TIMERS` (
=== modified file 'mysql-test/suite/perfschema/t/setup_actors.test'
--- a/mysql-test/suite/perfschema/t/setup_actors.test 2010-09-01 22:59:33 +0000
+++ b/mysql-test/suite/perfschema/t/setup_actors.test 2010-09-02 00:00:20 +0000
@@ -218,6 +218,7 @@ where PROCESSLIST_ID = connection_id();
--echo # Switch to (con5, localhost, user5, , )
connect (con5, localhost, user5, , );
+--replace_result '\'threads' '\'THREADS'
--error ER_TABLEACCESS_DENIED_ERROR
select * from performance_schema.THREADS;
# 1. INSTRUMENTED must be YES because there are two matches
Attachment: [text/bzr-bundle] bzr/marc.alff@oracle.com-20100902000020-akqn9tertwxj5w13.bundle
| Thread |
|---|
| • bzr commit into mysql-next-mr branch (marc.alff:3170) | Marc Alff | 2 Sep |
