From: Marc Alff Date: November 26 2010 10:37am Subject: bzr push into mysql-trunk-wl4816 branch (marc.alff:3209 to 3210) List-Archive: http://lists.mysql.com/commits/125113 Message-Id: <201011261039.oAQ7u4mQ029280@rcsinet13.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 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 3209 Marc Alff 2010-11-24 [merge] Merge mysql-trunk (revno 3206) --> mysql-trunk-wl4816 added: mysql-test/extra/rpl_tests/rpl_change_master.test mysql-test/extra/rpl_tests/rpl_crash_safe.inc mysql-test/extra/rpl_tests/rpl_crash_safe.test mysql-test/include/not_master_info_table.inc mysql-test/include/not_relay_log_info_table.inc mysql-test/suite/rpl/r/rpl_change_master_crash_safe.result mysql-test/suite/rpl/r/rpl_migration_crash_safe.result mysql-test/suite/rpl/r/rpl_mixed_crash_safe.result mysql-test/suite/rpl/r/rpl_row_crash_safe.result mysql-test/suite/rpl/r/rpl_stm_crash_safe.result mysql-test/suite/rpl/t/rpl_change_master_crash_safe-slave.opt mysql-test/suite/rpl/t/rpl_change_master_crash_safe.test mysql-test/suite/rpl/t/rpl_migration_crash_safe.test mysql-test/suite/rpl/t/rpl_mixed_crash_safe-slave.opt mysql-test/suite/rpl/t/rpl_mixed_crash_safe.test mysql-test/suite/rpl/t/rpl_row_crash_safe-slave.opt mysql-test/suite/rpl/t/rpl_row_crash_safe.test mysql-test/suite/rpl/t/rpl_stm_crash_safe-slave.opt mysql-test/suite/rpl/t/rpl_stm_crash_safe.test sql/rpl_info_table.cc sql/rpl_info_table.h sql/rpl_info_table_access.cc sql/rpl_info_table_access.h sql/rpl_info_values.cc sql/rpl_info_values.h modified: client/mysqldump.c mysql-test/collections/default.experimental mysql-test/extra/rpl_tests/rpl_flsh_tbls.test mysql-test/r/1st.result mysql-test/r/connect.result mysql-test/r/information_schema.result mysql-test/r/log_tables.result mysql-test/r/log_tables_upgrade.result mysql-test/r/mysql_upgrade.result mysql-test/r/mysql_upgrade_ssl.result mysql-test/r/mysqlcheck.result mysql-test/r/system_mysql_db.result mysql-test/suite/funcs_1/r/is_columns_mysql.result mysql-test/suite/funcs_1/r/is_key_column_usage.result mysql-test/suite/funcs_1/r/is_statistics.result mysql-test/suite/funcs_1/r/is_statistics_mysql.result mysql-test/suite/funcs_1/r/is_table_constraints.result mysql-test/suite/funcs_1/r/is_table_constraints_mysql.result mysql-test/suite/funcs_1/r/is_tables_mysql.result mysql-test/suite/perfschema/r/pfs_upgrade_lc0.result mysql-test/suite/perfschema/r/pfs_upgrade_lc1.result mysql-test/suite/perfschema/r/pfs_upgrade_lc2.result mysql-test/suite/rpl/r/rpl_change_master.result mysql-test/suite/rpl/t/rpl_change_master.test mysql-test/suite/rpl/t/rpl_flushlog_loop.test mysql-test/suite/rpl/t/rpl_rotate_logs.test mysql-test/suite/rpl/t/rpl_seconds_behind_master.test mysql-test/suite/rpl/t/rpl_show_master_info_file.test mysql-test/suite/rpl/t/rpl_stm_flsh_tbls.test mysql-test/suite/rpl/t/rpl_sync.test mysql-test/suite/sys_vars/t/master_info_repository_basic.test mysql-test/suite/sys_vars/t/relay_log_info_repository_basic.test mysql-test/t/system_mysql_db_fix40123.test mysql-test/t/system_mysql_db_fix50030.test mysql-test/t/system_mysql_db_fix50117.test scripts/mysql_install_db.pl.in scripts/mysql_install_db.sh scripts/mysql_system_tables.sql sql/CMakeLists.txt sql/Makefile.am sql/lock.cc sql/log_event.cc sql/rpl_info.h sql/rpl_info_factory.cc sql/rpl_info_factory.h sql/rpl_info_file.cc sql/rpl_info_file.h sql/rpl_info_handler.cc sql/rpl_info_handler.h sql/rpl_rli.h sql/rpl_slave.cc sql/rpl_slave.h sql/server_ids.h sql/share/errmsg-utf8.txt sql/sql_base.cc sql/sql_base.h sql/sql_binlog.cc sql/sql_class.h sql/sql_parse.cc sql/sql_parse.h sql/sys_vars.cc sql/table.cc sql/table.h === 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 No bundle (reason: useless for push emails).