bzr commit into mysql-trunk-wl4816 branch (marc.alff:3210)

[Marc Alff]

#At file:///Users/malff/BZR_TREE/mysql-trunk-wl4816/ based on revid:marc.alff@stripped

 3210 Marc Alff	2010-11-26
      Aligned the perfschema_stress test suite to latest changes in mysql-trunk
      - performance schema tables are in lowercase
      - table processlist is renamed to threads

    modified:
      mysql-test/suite/perfschema_stress/r/modify.result
      mysql-test/suite/perfschema_stress/r/read.result
      mysql-test/suite/perfschema_stress/t/modify.test
      mysql-test/suite/perfschema_stress/t/read.test
      mysql-test/suite/perfschema_stress/t/setup.test
=== modified file 'mysql-test/suite/perfschema_stress/r/modify.result'
--- a/mysql-test/suite/perfschema_stress/r/modify.result	2010-01-12 01:47:27 +0000
+++ b/mysql-test/suite/perfschema_stress/r/modify.result	2010-11-26 10:36:52 +0000
@@ -1,17 +1,17 @@
-UPDATE performance_schema.SETUP_INSTRUMENTS SET TIMED = 'NO';
-UPDATE performance_schema.SETUP_INSTRUMENTS SET ENABLED = 'NO';
-UPDATE performance_schema.SETUP_TIMERS 
+UPDATE performance_schema.setup_instruments SET TIMED = 'NO';
+UPDATE performance_schema.setup_instruments SET ENABLED = 'NO';
+UPDATE performance_schema.setup_timers
 SET TIMER_NAME = 'NANOSECOND' WHERE NAME = 'Wait';
-UPDATE performance_schema.SETUP_TIMERS 
+UPDATE performance_schema.setup_timers
 SET TIMER_NAME = 'CYCLE' WHERE NAME = 'Wait';
-UPDATE performance_schema.SETUP_INSTRUMENTS SET TIMED = 'YES';
-UPDATE performance_schema.SETUP_INSTRUMENTS SET ENABLED = 'YES' 
-WHERE NAME IN ('wait/io/file/sql/FRM', 
-'thread/sql/Connection', 
-'wait/synch/cond/sql/COND_mdl', 
-'wait/synch/rwlock/sql/LOCK_sys_init_connect', 
+UPDATE performance_schema.setup_instruments SET TIMED = 'YES';
+UPDATE performance_schema.setup_instruments SET ENABLED = 'YES'
+WHERE NAME IN ('wait/io/file/sql/FRM',
+'thread/sql/Connection',
+'wait/synch/cond/sql/COND_mdl',
+'wait/synch/rwlock/sql/LOCK_sys_init_connect',
 'wait/synch/mutex/sql/LOCK_mdl');
-UPDATE performance_schema.SETUP_CONSUMERS SET ENABLED = 'NO'
+UPDATE performance_schema.setup_consumers SET ENABLED = 'NO'
 WHERE NAME = 'events_waits_history';
-UPDATE performance_schema.SETUP_CONSUMERS SET ENABLED = 'YES'
+UPDATE performance_schema.setup_consumers SET ENABLED = 'YES'
 WHERE NAME = 'events_waits_history';

=== modified file 'mysql-test/suite/perfschema_stress/r/read.result'
--- a/mysql-test/suite/perfschema_stress/r/read.result	2010-01-12 01:47:27 +0000
+++ b/mysql-test/suite/perfschema_stress/r/read.result	2010-11-26 10:36:52 +0000
@@ -1,21 +1,21 @@
-SELECT * FROM performance_schema.SETUP_INSTRUMENTS
+SELECT * FROM performance_schema.setup_instruments
 WHERE ENABLED='NO' AND TIMED='NO';
 NAME	ENABLED	TIMED
-SELECT * FROM performance_schema.EVENTS_WAITS_CURRENT
+SELECT * FROM performance_schema.events_waits_current
 WHERE (TIMER_END - TIMER_START != TIMER_WAIT);
 THREAD_ID	EVENT_ID	EVENT_NAME	SOURCE	TIMER_START	TIMER_END	TIMER_WAIT	SPINS	OBJECT_SCHEMA	OBJECT_NAME	OBJECT_TYPE	OBJECT_INSTANCE_BEGIN	NESTING_EVENT_ID	OPERATION	NUMBER_OF_BYTES	FLAGS
-SELECT * FROM performance_schema.EVENTS_WAITS_HISTORY
+SELECT * FROM performance_schema.events_waits_history
 WHERE SPINS != NULL;
 THREAD_ID	EVENT_ID	EVENT_NAME	SOURCE	TIMER_START	TIMER_END	TIMER_WAIT	SPINS	OBJECT_SCHEMA	OBJECT_NAME	OBJECT_TYPE	OBJECT_INSTANCE_BEGIN	NESTING_EVENT_ID	OPERATION	NUMBER_OF_BYTES	FLAGS
-SELECT * FROM performance_schema.PROCESSLIST p,
-performance_schema.EVENTS_WAITS_CURRENT e
-WHERE p.THREAD_ID = e.THREAD_ID 
+SELECT * FROM performance_schema.threads p,
+performance_schema.events_waits_current e
+WHERE p.THREAD_ID = e.THREAD_ID
 AND TIMER_START = 0
 ORDER BY e.EVENT_ID;
-THREAD_ID	ID	NAME	THREAD_ID	EVENT_ID	EVENT_NAME	SOURCE	TIMER_START	TIMER_END	TIMER_WAIT	SPINS	OBJECT_SCHEMA	OBJECT_NAME	OBJECT_TYPE	OBJECT_INSTANCE_BEGIN	NESTING_EVENT_ID	OPERATION	NUMBER_OF_BYTES	FLAGS
-SELECT * FROM performance_schema.EVENTS_WAITS_CURRENT
-WHERE THREAD_ID IN (SELECT THREAD_ID 
-FROM performance_schema.PROCESSLIST
+THREAD_ID	NAME	TYPE	PROCESSLIST_ID	PROCESSLIST_USER	PROCESSLIST_HOST	PROCESSLIST_DB	PROCESSLIST_COMMAND	PROCESSLIST_TIME	PROCESSLIST_STATE	PROCESSLIST_INFO	PARENT_THREAD_ID	ROLE	INSTRUMENTED	THREAD_ID	EVENT_ID	EVENT_NAME	SOURCE	TIMER_START	TIMER_END	TIMER_WAIT	SPINS	OBJECT_SCHEMA	OBJECT_NAME	OBJECT_TYPE	OBJECT_INSTANCE_BEGIN	NESTING_EVENT_ID	OPERATION	NUMBER_OF_BYTES	FLAGS
+SELECT * FROM performance_schema.events_waits_current
+WHERE THREAD_ID IN (SELECT THREAD_ID
+FROM performance_schema.threads
 ORDER BY THREAD_ID)
 AND TIMER_END = 0
 AND TIMER_WAIT != NULL
@@ -25,5 +25,5 @@ SELECT SUM(COUNT_READ) AS sum_count_read
 SUM(COUNT_WRITE) AS sum_count_write,
 SUM(SUM_NUMBER_OF_BYTES_READ) AS sum_num_bytes_read,
 SUM(SUM_NUMBER_OF_BYTES_WRITE) AS sum_num_bytes_write
-FROM performance_schema.FILE_SUMMARY_BY_INSTANCE 
+FROM performance_schema.file_summary_by_instance
 WHERE FILE_NAME LIKE CONCAT('%', @@tmpdir, '%') ORDER BY NULL;

=== modified file 'mysql-test/suite/perfschema_stress/t/modify.test'
--- a/mysql-test/suite/perfschema_stress/t/modify.test	2010-01-12 01:47:27 +0000
+++ b/mysql-test/suite/perfschema_stress/t/modify.test	2010-11-26 10:36:52 +0000
@@ -23,22 +23,22 @@ if (`SELECT ($have_table = 0)`) {
     --source suite/perfschema_stress/t/setup.test
 }
 
-UPDATE performance_schema.SETUP_INSTRUMENTS SET TIMED = 'NO';
+UPDATE performance_schema.setup_instruments SET TIMED = 'NO';
 
-UPDATE performance_schema.SETUP_INSTRUMENTS SET ENABLED = 'NO';
+UPDATE performance_schema.setup_instruments SET ENABLED = 'NO';
 
-UPDATE performance_schema.SETUP_TIMERS
+UPDATE performance_schema.setup_timers
 SET TIMER_NAME = 'NANOSECOND' WHERE NAME = 'Wait';
 
 # Let it run some time with the new timer name and instruments
 --sleep 1
 
-UPDATE performance_schema.SETUP_TIMERS
+UPDATE performance_schema.setup_timers
 SET TIMER_NAME = 'CYCLE' WHERE NAME = 'Wait';
 
-UPDATE performance_schema.SETUP_INSTRUMENTS SET TIMED = 'YES';
+UPDATE performance_schema.setup_instruments SET TIMED = 'YES';
 
-UPDATE performance_schema.SETUP_INSTRUMENTS SET ENABLED = 'YES'
+UPDATE performance_schema.setup_instruments SET ENABLED = 'YES'
 WHERE NAME IN ('wait/io/file/sql/FRM',
                'thread/sql/Connection',
                'wait/synch/cond/sql/COND_mdl',
@@ -48,8 +48,8 @@ WHERE NAME IN ('wait/io/file/sql/FRM',
 # Two short lived changes to see that switching does not lead
 # to havoc.
 
-UPDATE performance_schema.SETUP_CONSUMERS SET ENABLED = 'NO'
+UPDATE performance_schema.setup_consumers SET ENABLED = 'NO'
 WHERE NAME = 'events_waits_history';
 
-UPDATE performance_schema.SETUP_CONSUMERS SET ENABLED = 'YES'
+UPDATE performance_schema.setup_consumers SET ENABLED = 'YES'
 WHERE NAME = 'events_waits_history';

=== modified file 'mysql-test/suite/perfschema_stress/t/read.test'
--- a/mysql-test/suite/perfschema_stress/t/read.test	2010-01-12 01:47:27 +0000
+++ b/mysql-test/suite/perfschema_stress/t/read.test	2010-11-26 10:36:52 +0000
@@ -15,24 +15,24 @@
 
 --source include/not_embedded.inc
 
-SELECT * FROM performance_schema.SETUP_INSTRUMENTS
+SELECT * FROM performance_schema.setup_instruments
 WHERE ENABLED='NO' AND TIMED='NO';
 
-SELECT * FROM performance_schema.EVENTS_WAITS_CURRENT
+SELECT * FROM performance_schema.events_waits_current
 WHERE (TIMER_END - TIMER_START != TIMER_WAIT);
 
-SELECT * FROM performance_schema.EVENTS_WAITS_HISTORY
+SELECT * FROM performance_schema.events_waits_history
 WHERE SPINS != NULL;
 
-SELECT * FROM performance_schema.PROCESSLIST p,
-              performance_schema.EVENTS_WAITS_CURRENT e
+SELECT * FROM performance_schema.threads p,
+              performance_schema.events_waits_current e
 WHERE p.THREAD_ID = e.THREAD_ID
   AND TIMER_START = 0
 ORDER BY e.EVENT_ID;
 
-SELECT * FROM performance_schema.EVENTS_WAITS_CURRENT
+SELECT * FROM performance_schema.events_waits_current
 WHERE THREAD_ID IN (SELECT THREAD_ID
-                    FROM performance_schema.PROCESSLIST
+                    FROM performance_schema.threads
                     ORDER BY THREAD_ID)
   AND TIMER_END = 0
   AND TIMER_WAIT != NULL
@@ -43,7 +43,7 @@ SELECT SUM(COUNT_READ) AS sum_count_read
        SUM(COUNT_WRITE) AS sum_count_write,
        SUM(SUM_NUMBER_OF_BYTES_READ) AS sum_num_bytes_read,
        SUM(SUM_NUMBER_OF_BYTES_WRITE) AS sum_num_bytes_write
-FROM performance_schema.FILE_SUMMARY_BY_INSTANCE
+FROM performance_schema.file_summary_by_instance
 WHERE FILE_NAME LIKE CONCAT('%', @@tmpdir, '%') ORDER BY NULL;
 --enable_result_log
 

=== modified file 'mysql-test/suite/perfschema_stress/t/setup.test'
--- a/mysql-test/suite/perfschema_stress/t/setup.test	2010-01-12 01:47:27 +0000
+++ b/mysql-test/suite/perfschema_stress/t/setup.test	2010-11-26 10:36:52 +0000
@@ -48,17 +48,17 @@ while (`SELECT MAX(id) < $num_stress_row
 
 # Turn on some instruments
 
-UPDATE performance_schema.SETUP_INSTRUMENTS SET TIMED = 'YES';
+UPDATE performance_schema.setup_instruments SET TIMED = 'YES';
 
-UPDATE performance_schema.SETUP_INSTRUMENTS SET ENABLED = 'NO';
-UPDATE performance_schema.SETUP_INSTRUMENTS SET ENABLED = 'YES'
+UPDATE performance_schema.setup_instruments SET ENABLED = 'NO';
+UPDATE performance_schema.setup_instruments SET ENABLED = 'YES'
 WHERE NAME IN ('wait/io/file/sql/FRM',
                'thread/sql/Connection',
                'wait/synch/cond/sql/COND_mdl',
                'wait/synch/rwlock/sql/LOCK_sys_init_connect',
                'wait/synch/mutex/sql/LOCK_mdl');
 
-UPDATE performance_schema.SETUP_CONSUMERS SET ENABLED = 'YES';
+UPDATE performance_schema.setup_consumers SET ENABLED = 'YES';
 
 --enable_result_log
 --enable_query_log


Attachment: [text/bzr-bundle] bzr/[e-mail]