From: Marc Alff Date: November 26 2010 10:37am Subject: bzr commit into mysql-trunk-wl4816 branch (marc.alff:3210) List-Archive: http://lists.mysql.com/commits/125111 Message-Id: <201011261038.oAPH4R0K017508@acsinet15.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3838037981525230400==" --===============3838037981525230400== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #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 --===============3838037981525230400== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/marc.alff@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marc.alff@stripped # target_branch: file:///Users/malff/BZR_TREE/mysql-trunk-wl4816/ # testament_sha1: 3c594f6085002f27ce5320f23cd401ca80a3e620 # timestamp: 2010-11-26 11:37:15 +0100 # source_branch: file:///Users/malff/BZR_TREE/mysql-trunk/ # base_revision_id: marc.alff@stripped\ # uqpn1jtls9sufvng # # Begin bundle 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 pQMBh+Bm+pz4Df/8XckU4UJDMcpeJA== --===============3838037981525230400==--