3429 Christopher Powers 2011-11-16
WL#5461 PERFORMANCE_SCHEMA MY.CNF Default Setup
Added test cases to verify the new cnf options:
- setup_instruments_defaults
- setup_consumers_defaults
added:
mysql-test/suite/perfschema/r/setup_consumers_defaults.result
mysql-test/suite/perfschema/r/setup_instruments_defaults.result
mysql-test/suite/perfschema/t/setup_consumers_defaults-master.opt
mysql-test/suite/perfschema/t/setup_consumers_defaults.test
mysql-test/suite/perfschema/t/setup_instruments_defaults-master.opt
mysql-test/suite/perfschema/t/setup_instruments_defaults.test
modified:
mysql-test/r/mysqld--help-notwin.result
storage/perfschema/pfs_instr_class.cc
3428 Christopher Powers 2011-11-15
WL#5461 PERFORMANCE_SCHEMA MY.CNF Default Setup
Changes per code review:
- Support event name wildcards for performance_schema_instrument config option
- Move my_getopt.c reformatting to separate commit
- Handle default configuration for global events: idle, table io, table locks
- Enable all instruments in default_mysqld.cnf
modified:
mysql-test/include/default_mysqld.cnf
mysys/my_getopt.c
sql/sys_vars.cc
storage/perfschema/pfs_instr_class.cc
storage/perfschema/pfs_server.cc
=== modified file 'mysql-test/r/mysqld--help-notwin.result'
--- a/mysql-test/r/mysqld--help-notwin.result 2011-11-02 16:07:18 +0000
+++ b/mysql-test/r/mysqld--help-notwin.result 2011-11-16 07:05:50 +0000
@@ -453,6 +453,31 @@ The following options may be given as th
Enable the performance schema.
--performance-schema-accounts-size=#
Maximum number of instrumented user@host accounts.
+ --performance-schema-consumer-events-stages-current
+ Enable the events_stages_current consumer.
+ --performance-schema-consumer-events-stages-history
+ Enable the events_stages_history consumer.
+ --performance-schema-consumer-events-stages-history-long
+ Enable the events_stages_history_long consumer.
+ --performance-schema-consumer-events-statements-current
+ Enable the events_statements_current consumer.
+ (Defaults to on; use --skip-performance-schema-consumer-events-statements-current to disable.)
+ --performance-schema-consumer-events-statements-history
+ Enable the events_statements_history consumer.
+ --performance-schema-consumer-events-statements-history-long
+ Enable the events_statements_history_long consumer.
+ --performance-schema-consumer-events-waits-current
+ Enable the events_waits_current consumer.
+ --performance-schema-consumer-events-waits-history
+ Enable the events_waits_history consumer.
+ --performance-schema-consumer-events-waits-history-long
+ Enable the events_waits_history_long consumer.
+ --performance-schema-consumer-global-instrumentation
+ Enable the global_instrumentation consumer.
+ (Defaults to on; use --skip-performance-schema-consumer-global-instrumentation to disable.)
+ --performance-schema-consumer-thread-instrumentation
+ Enable the thread_instrumentation consumer.
+ (Defaults to on; use --skip-performance-schema-consumer-thread-instrumentation to disable.)
--performance-schema-events-stages-history-long-size=#
Number of rows in EVENTS_STAGES_HISTORY_LONG.
--performance-schema-events-stages-history-size=#
@@ -467,6 +492,8 @@ The following options may be given as th
Number of rows per thread in EVENTS_WAITS_HISTORY.
--performance-schema-hosts-size=#
Maximum number of instrumented hosts.
+ --performance-schema-instrument[=name]
+ Enable a performance schema instrument.
--performance-schema-max-cond-classes=#
Maximum number of condition instruments.
--performance-schema-max-cond-instances=#
@@ -959,6 +986,17 @@ optimizer-trace-max-mem-size 16384
optimizer-trace-offset -1
performance-schema FALSE
performance-schema-accounts-size 100
+performance-schema-consumer-events-stages-current FALSE
+performance-schema-consumer-events-stages-history FALSE
+performance-schema-consumer-events-stages-history-long FALSE
+performance-schema-consumer-events-statements-current TRUE
+performance-schema-consumer-events-statements-history FALSE
+performance-schema-consumer-events-statements-history-long FALSE
+performance-schema-consumer-events-waits-current FALSE
+performance-schema-consumer-events-waits-history FALSE
+performance-schema-consumer-events-waits-history-long FALSE
+performance-schema-consumer-global-instrumentation TRUE
+performance-schema-consumer-thread-instrumentation TRUE
performance-schema-events-stages-history-long-size 10000
performance-schema-events-stages-history-size 10
performance-schema-events-statements-history-long-size 10000
@@ -966,6 +1004,7 @@ performance-schema-events-statements-his
performance-schema-events-waits-history-long-size 10000
performance-schema-events-waits-history-size 10
performance-schema-hosts-size 100
+performance-schema-instrument
performance-schema-max-cond-classes 80
performance-schema-max-cond-instances 1000
performance-schema-max-file-classes 50
=== added file 'mysql-test/suite/perfschema/r/setup_consumers_defaults.result'
--- a/mysql-test/suite/perfschema/r/setup_consumers_defaults.result 1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/perfschema/r/setup_consumers_defaults.result 2011-11-16 07:05:50 +0000
@@ -0,0 +1,23 @@
+SELECT COUNT(*) = 6 AS 'Expect 1'
+FROM performance_schema.setup_consumers
+WHERE enabled = 'yes';
+Expect 1
+1
+SELECT COUNT(*) = 5 AS 'Expect 1'
+FROM performance_schema.setup_consumers
+WHERE enabled = 'no';
+Expect 1
+1
+SELECT * FROM performance_schema.setup_consumers ORDER BY name;
+NAME ENABLED
+events_stages_current NO
+events_stages_history YES
+events_stages_history_long NO
+events_statements_current YES
+events_statements_history NO
+events_statements_history_long YES
+events_waits_current NO
+events_waits_history YES
+events_waits_history_long NO
+global_instrumentation YES
+thread_instrumentation YES
=== added file 'mysql-test/suite/perfschema/r/setup_instruments_defaults.result'
--- a/mysql-test/suite/perfschema/r/setup_instruments_defaults.result 1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/perfschema/r/setup_instruments_defaults.result 2011-11-16 07:05:50 +0000
@@ -0,0 +1,532 @@
+SELECT COUNT(*) = 31 AS 'Expect 1'
+FROM performance_schema.setup_instruments
+WHERE name LIKE 'wait/synch/mutex/sql/%' AND enabled = 'no' and timed = 'no';
+Expect 1
+1
+SELECT COUNT(*) = 1 AS 'Expect 1'
+FROM performance_schema.setup_instruments
+WHERE name = 'wait/synch/mutex/sql/LOCK_thread_count' AND enabled = 'no' and timed = 'no';
+Expect 1
+1
+SELECT COUNT(*) = 4 AS 'Expect 1'
+FROM performance_schema.setup_instruments
+WHERE name LIKE 'wait/synch/mutex/sql/LOCK_%' AND enabled = 'yes' and timed = 'no';
+Expect 1
+1
+SELECT COUNT(*) = 1 AS 'Expect 1'
+FROM performance_schema.setup_instruments
+WHERE name LIKE 'stage/%' AND enabled = 'yes' and timed = 'no';
+Expect 1
+1
+SELECT * FROM performance_schema.setup_instruments ORDER BY name;
+NAME ENABLED TIMED
+idle YES YES
+stage/mysys/Waiting for table level lock YES YES
+stage/sql/After create YES YES
+stage/sql/allocating local table YES YES
+stage/sql/Changing master YES YES
+stage/sql/Checking master version YES YES
+stage/sql/checking permissions YES YES
+stage/sql/checking privileges on cached query YES YES
+stage/sql/checking query cache for query YES YES
+stage/sql/cleaning up YES YES
+stage/sql/closing tables YES YES
+stage/sql/Connecting to master YES YES
+stage/sql/converting HEAP to MyISAM YES YES
+stage/sql/copy to tmp table YES YES
+stage/sql/Copying to group table YES YES
+stage/sql/Copying to tmp table YES YES
+stage/sql/Creating delayed handler YES YES
+stage/sql/Creating sort index YES YES
+stage/sql/creating table YES YES
+stage/sql/Creating tmp table YES YES
+stage/sql/deleting from main table YES YES
+stage/sql/deleting from reference tables YES YES
+stage/sql/discard_or_import_tablespace YES YES
+stage/sql/end YES YES
+stage/sql/executing YES YES
+stage/sql/Execution of init_command YES YES
+stage/sql/Finished reading one binlog; switching to next binlog YES YES
+stage/sql/Flushing relay log and master info repository. YES YES
+stage/sql/Flushing relay-log info file. YES YES
+stage/sql/freeing items YES YES
+stage/sql/FULLTEXT initialization YES YES
+stage/sql/got handler lock YES YES
+stage/sql/got old table YES YES
+stage/sql/init YES YES
+stage/sql/insert YES YES
+stage/sql/invalidating query cache entries (table list) YES YES
+stage/sql/invalidating query cache entries (table) YES YES
+stage/sql/Killing slave YES YES
+stage/sql/logging slow query YES YES
+stage/sql/Making temporary file (append) before replaying LOAD DATA INFILE. YES YES
+stage/sql/Making temporary file (create) before replaying LOAD DATA INFILE. YES YES
+stage/sql/manage keys YES YES
+stage/sql/Master has sent all binlog to slave; waiting for binlog to be updated YES YES
+stage/sql/Opening tables YES YES
+stage/sql/optimizing YES YES
+stage/sql/preparing YES YES
+stage/sql/Purging old relay logs YES YES
+stage/sql/query end YES YES
+stage/sql/Queueing master event to the relay log YES YES
+stage/sql/Reading event from the relay log YES YES
+stage/sql/Registering slave on master YES YES
+stage/sql/Removing duplicates YES YES
+stage/sql/removing tmp table YES YES
+stage/sql/rename YES YES
+stage/sql/rename result table YES YES
+stage/sql/Requesting binlog dump YES YES
+stage/sql/reschedule YES YES
+stage/sql/Searching rows for update YES YES
+stage/sql/Sending binlog event to slave YES YES
+stage/sql/sending cached result to client YES YES
+stage/sql/Sending data YES YES
+stage/sql/setup YES YES
+stage/sql/Slave has read all relay log; waiting for the slave I/O thread to update it YES YES
+stage/sql/Sorting for group YES YES
+stage/sql/Sorting for order YES YES
+stage/sql/Sorting result YES YES
+stage/sql/statistics YES YES
+stage/sql/storing result in query cache YES YES
+stage/sql/storing row into queue YES YES
+stage/sql/System lock YES YES
+stage/sql/update YES YES
+stage/sql/updating YES YES
+stage/sql/updating main table YES YES
+stage/sql/updating reference tables YES YES
+stage/sql/upgrading lock YES YES
+stage/sql/User lock YES YES
+stage/sql/User sleep YES YES
+stage/sql/verifying table YES YES
+stage/sql/Waiting for commit lock YES YES
+stage/sql/waiting for delay_list YES YES
+stage/sql/Waiting for event metadata lock YES YES
+stage/sql/Waiting for global read lock YES YES
+stage/sql/waiting for handler insert YES YES
+stage/sql/waiting for handler lock YES YES
+stage/sql/waiting for handler open YES YES
+stage/sql/Waiting for INSERT YES YES
+stage/sql/Waiting for master to send event YES YES
+stage/sql/Waiting for master update YES YES
+stage/sql/Waiting for next activation YES YES
+stage/sql/Waiting for query cache lock YES YES
+stage/sql/Waiting for schema metadata lock YES YES
+stage/sql/Waiting for slave mutex on exit YES YES
+stage/sql/Waiting for slave thread to start YES YES
+stage/sql/Waiting for stored function metadata lock YES YES
+stage/sql/Waiting for stored procedure metadata lock YES YES
+stage/sql/Waiting for table flush YES YES
+stage/sql/Waiting for table metadata lock YES YES
+stage/sql/Waiting for the next event in relay log YES YES
+stage/sql/Waiting for the scheduler to stop YES YES
+stage/sql/Waiting for the slave SQL thread to advance position YES YES
+stage/sql/Waiting for trigger metadata lock YES YES
+stage/sql/Waiting on empty queue YES YES
+stage/sql/Waiting to finalize termination YES YES
+stage/sql/Waiting to get readlock YES YES
+stage/sql/Waiting until MASTER_DELAY seconds after master executed event YES NO
+statement/com/ YES YES
+statement/com/Binlog Dump YES YES
+statement/com/Change user YES YES
+statement/com/Close stmt YES YES
+statement/com/Connect YES YES
+statement/com/Connect Out YES YES
+statement/com/Create DB YES YES
+statement/com/Daemon YES YES
+statement/com/Debug YES YES
+statement/com/Delayed insert YES YES
+statement/com/Drop DB YES YES
+statement/com/Error YES YES
+statement/com/Execute YES YES
+statement/com/Fetch YES YES
+statement/com/Field List YES YES
+statement/com/Init DB YES YES
+statement/com/Kill YES YES
+statement/com/Long Data YES YES
+statement/com/Ping YES YES
+statement/com/Prepare YES YES
+statement/com/Processlist YES YES
+statement/com/Query YES YES
+statement/com/Quit YES YES
+statement/com/Refresh YES YES
+statement/com/Register Slave YES YES
+statement/com/Reset stmt YES YES
+statement/com/Set option YES YES
+statement/com/Shutdown YES YES
+statement/com/Sleep YES YES
+statement/com/Statistics YES YES
+statement/com/Table Dump YES YES
+statement/com/Time YES YES
+statement/sql/alter_db YES YES
+statement/sql/alter_db_upgrade YES YES
+statement/sql/alter_event YES YES
+statement/sql/alter_function YES YES
+statement/sql/alter_procedure YES YES
+statement/sql/alter_server YES YES
+statement/sql/alter_table YES YES
+statement/sql/alter_tablespace YES YES
+statement/sql/analyze YES YES
+statement/sql/assign_to_keycache YES YES
+statement/sql/begin YES YES
+statement/sql/binlog YES YES
+statement/sql/call_procedure YES YES
+statement/sql/change_db YES YES
+statement/sql/change_master YES YES
+statement/sql/check YES YES
+statement/sql/checksum YES YES
+statement/sql/commit YES YES
+statement/sql/create_db YES YES
+statement/sql/create_event YES YES
+statement/sql/create_function YES YES
+statement/sql/create_index YES YES
+statement/sql/create_procedure YES YES
+statement/sql/create_server YES YES
+statement/sql/create_table YES YES
+statement/sql/create_trigger YES YES
+statement/sql/create_udf YES YES
+statement/sql/create_user YES YES
+statement/sql/create_view YES YES
+statement/sql/dealloc_sql YES YES
+statement/sql/delete YES YES
+statement/sql/delete_multi YES YES
+statement/sql/do YES YES
+statement/sql/drop_db YES YES
+statement/sql/drop_event YES YES
+statement/sql/drop_function YES YES
+statement/sql/drop_index YES YES
+statement/sql/drop_procedure YES YES
+statement/sql/drop_server YES YES
+statement/sql/drop_table YES YES
+statement/sql/drop_trigger YES YES
+statement/sql/drop_user YES YES
+statement/sql/drop_view YES YES
+statement/sql/empty_query YES YES
+statement/sql/error YES YES
+statement/sql/execute_sql YES YES
+statement/sql/flush YES YES
+statement/sql/get_diagnostics YES YES
+statement/sql/grant YES YES
+statement/sql/ha_close YES YES
+statement/sql/ha_open YES YES
+statement/sql/ha_read YES YES
+statement/sql/help YES YES
+statement/sql/insert YES YES
+statement/sql/insert_select YES YES
+statement/sql/install_plugin YES YES
+statement/sql/kill YES YES
+statement/sql/load YES YES
+statement/sql/lock_tables YES YES
+statement/sql/optimize YES YES
+statement/sql/preload_keys YES YES
+statement/sql/prepare_sql YES YES
+statement/sql/purge YES YES
+statement/sql/purge_before_date YES YES
+statement/sql/release_savepoint YES YES
+statement/sql/rename_table YES YES
+statement/sql/rename_user YES YES
+statement/sql/repair YES YES
+statement/sql/replace YES YES
+statement/sql/replace_select YES YES
+statement/sql/reset YES YES
+statement/sql/resignal YES YES
+statement/sql/revoke YES YES
+statement/sql/revoke_all YES YES
+statement/sql/rollback YES YES
+statement/sql/rollback_to_savepoint YES YES
+statement/sql/savepoint YES YES
+statement/sql/select YES YES
+statement/sql/set_option YES YES
+statement/sql/show_authors YES YES
+statement/sql/show_binlogs YES YES
+statement/sql/show_binlog_events YES YES
+statement/sql/show_charsets YES YES
+statement/sql/show_collations YES YES
+statement/sql/show_contributors YES YES
+statement/sql/show_create_db YES YES
+statement/sql/show_create_event YES YES
+statement/sql/show_create_func YES YES
+statement/sql/show_create_proc YES YES
+statement/sql/show_create_table YES YES
+statement/sql/show_create_trigger YES YES
+statement/sql/show_databases YES YES
+statement/sql/show_engine_logs YES YES
+statement/sql/show_engine_mutex YES YES
+statement/sql/show_engine_status YES YES
+statement/sql/show_errors YES YES
+statement/sql/show_events YES YES
+statement/sql/show_fields YES YES
+statement/sql/show_function_code YES YES
+statement/sql/show_function_status YES YES
+statement/sql/show_grants YES YES
+statement/sql/show_keys YES YES
+statement/sql/show_master_status YES YES
+statement/sql/show_open_tables YES YES
+statement/sql/show_plugins YES YES
+statement/sql/show_privileges YES YES
+statement/sql/show_procedure_code YES YES
+statement/sql/show_procedure_status YES YES
+statement/sql/show_processlist YES YES
+statement/sql/show_profile YES YES
+statement/sql/show_profiles YES YES
+statement/sql/show_relaylog_events YES YES
+statement/sql/show_slave_hosts YES YES
+statement/sql/show_slave_status YES YES
+statement/sql/show_status YES YES
+statement/sql/show_storage_engines YES YES
+statement/sql/show_tables YES YES
+statement/sql/show_table_status YES YES
+statement/sql/show_triggers YES YES
+statement/sql/show_variables YES YES
+statement/sql/show_warnings YES YES
+statement/sql/signal YES YES
+statement/sql/slave_start YES YES
+statement/sql/slave_stop YES YES
+statement/sql/truncate YES YES
+statement/sql/uninstall_plugin YES YES
+statement/sql/unlock_tables YES YES
+statement/sql/update YES YES
+statement/sql/update_multi YES YES
+statement/sql/xa_commit YES YES
+statement/sql/xa_end YES YES
+statement/sql/xa_prepare YES YES
+statement/sql/xa_recover YES YES
+statement/sql/xa_rollback YES YES
+statement/sql/xa_start YES YES
+wait/io/file/csv/data YES YES
+wait/io/file/csv/metadata YES YES
+wait/io/file/csv/update YES YES
+wait/io/file/innodb/innodb_data_file YES YES
+wait/io/file/innodb/innodb_log_file YES YES
+wait/io/file/innodb/innodb_temp_file YES YES
+wait/io/file/myisam/data_tmp YES YES
+wait/io/file/myisam/dfile YES YES
+wait/io/file/myisam/kfile YES YES
+wait/io/file/myisam/log YES YES
+wait/io/file/myisammrg/MRG YES YES
+wait/io/file/mysys/charset YES YES
+wait/io/file/mysys/cnf YES YES
+wait/io/file/mysys/proc_meminfo YES YES
+wait/io/file/sql/binlog YES YES
+wait/io/file/sql/binlog_index YES YES
+wait/io/file/sql/casetest YES YES
+wait/io/file/sql/dbopt YES YES
+wait/io/file/sql/des_key_file YES YES
+wait/io/file/sql/ERRMSG YES YES
+wait/io/file/sql/file_parser YES YES
+wait/io/file/sql/FRM YES YES
+wait/io/file/sql/global_ddl_log YES YES
+wait/io/file/sql/init YES YES
+wait/io/file/sql/load YES YES
+wait/io/file/sql/LOAD_FILE YES YES
+wait/io/file/sql/log_event_data YES YES
+wait/io/file/sql/log_event_info YES YES
+wait/io/file/sql/map YES YES
+wait/io/file/sql/master_info YES YES
+wait/io/file/sql/misc YES YES
+wait/io/file/sql/partition YES YES
+wait/io/file/sql/pid YES YES
+wait/io/file/sql/query_log YES YES
+wait/io/file/sql/relaylog YES YES
+wait/io/file/sql/relaylog_index YES YES
+wait/io/file/sql/relay_log_info YES YES
+wait/io/file/sql/select_to_file YES YES
+wait/io/file/sql/send_file YES YES
+wait/io/file/sql/slow_log YES YES
+wait/io/file/sql/tclog YES YES
+wait/io/file/sql/trigger YES YES
+wait/io/file/sql/trigger_name YES YES
+wait/io/socket/sql/client_connection YES YES
+wait/io/socket/sql/server_tcpip_socket YES YES
+wait/io/socket/sql/server_unix_socket YES YES
+wait/io/table/sql/handler YES YES
+wait/lock/table/sql/handler YES YES
+wait/synch/cond/innodb/commit_cond YES YES
+wait/synch/cond/myisam/MI_SORT_INFO::cond YES YES
+wait/synch/cond/mysys/COND_alarm YES YES
+wait/synch/cond/mysys/IO_CACHE_SHARE::cond YES YES
+wait/synch/cond/mysys/IO_CACHE_SHARE::cond_writer YES YES
+wait/synch/cond/mysys/my_thread_var::suspend YES YES
+wait/synch/cond/mysys/THR_COND_threads YES YES
+wait/synch/cond/sql/COND_flush_thread_cache YES YES
+wait/synch/cond/sql/COND_manager YES YES
+wait/synch/cond/sql/COND_queue_state YES YES
+wait/synch/cond/sql/COND_server_started YES YES
+wait/synch/cond/sql/COND_thread_cache YES YES
+wait/synch/cond/sql/COND_thread_count YES YES
+wait/synch/cond/sql/DEBUG_SYNC::cond YES YES
+wait/synch/cond/sql/Delayed_insert::cond YES YES
+wait/synch/cond/sql/Delayed_insert::cond_client YES YES
+wait/synch/cond/sql/Event_scheduler::COND_state YES YES
+wait/synch/cond/sql/Item_func_sleep::cond YES YES
+wait/synch/cond/sql/Master_info::data_cond YES YES
+wait/synch/cond/sql/Master_info::sleep_cond YES YES
+wait/synch/cond/sql/Master_info::start_cond YES YES
+wait/synch/cond/sql/Master_info::stop_cond YES YES
+wait/synch/cond/sql/MDL_context::COND_wait_status YES YES
+wait/synch/cond/sql/MYSQL_BIN_LOG::COND_prep_xids NO NO
+wait/synch/cond/sql/MYSQL_BIN_LOG::update_cond NO NO
+wait/synch/cond/sql/MYSQL_RELAY_LOG::update_cond YES YES
+wait/synch/cond/sql/PAGE::cond YES YES
+wait/synch/cond/sql/Query_cache::COND_cache_status_changed YES YES
+wait/synch/cond/sql/Relay_log_info::data_cond YES YES
+wait/synch/cond/sql/Relay_log_info::log_space_cond YES YES
+wait/synch/cond/sql/Relay_log_info::pending_jobs_cond YES YES
+wait/synch/cond/sql/Relay_log_info::sleep_cond YES YES
+wait/synch/cond/sql/Relay_log_info::start_cond YES YES
+wait/synch/cond/sql/Relay_log_info::stop_cond YES YES
+wait/synch/cond/sql/TABLE_SHARE::cond YES YES
+wait/synch/cond/sql/TC_LOG_MMAP::COND_active YES YES
+wait/synch/cond/sql/TC_LOG_MMAP::COND_pool YES YES
+wait/synch/cond/sql/User_level_lock::cond YES YES
+wait/synch/cond/sql/Worker_info::jobs_cond YES YES
+wait/synch/mutex/archive/archive_mutex YES YES
+wait/synch/mutex/archive/ARCHIVE_SHARE::mutex YES YES
+wait/synch/mutex/blackhole/blackhole YES YES
+wait/synch/mutex/csv/tina YES YES
+wait/synch/mutex/csv/TINA_SHARE::mutex YES YES
+wait/synch/mutex/innodb/autoinc_mutex YES YES
+wait/synch/mutex/innodb/buf_pool_mutex YES YES
+wait/synch/mutex/innodb/buf_pool_zip_mutex YES YES
+wait/synch/mutex/innodb/cache_last_read_mutex YES YES
+wait/synch/mutex/innodb/commit_cond_mutex YES YES
+wait/synch/mutex/innodb/commit_threads_m YES YES
+wait/synch/mutex/innodb/dict_foreign_err_mutex YES YES
+wait/synch/mutex/innodb/dict_sys_mutex YES YES
+wait/synch/mutex/innodb/file_format_max_mutex YES YES
+wait/synch/mutex/innodb/fil_system_mutex YES YES
+wait/synch/mutex/innodb/flush_list_mutex YES YES
+wait/synch/mutex/innodb/hash_table_mutex YES YES
+wait/synch/mutex/innodb/ibuf_bitmap_mutex YES YES
+wait/synch/mutex/innodb/ibuf_mutex YES YES
+wait/synch/mutex/innodb/ibuf_pessimistic_insert_mutex YES YES
+wait/synch/mutex/innodb/innobase_share_mutex YES YES
+wait/synch/mutex/innodb/lock_mutex YES YES
+wait/synch/mutex/innodb/lock_wait_mutex YES YES
+wait/synch/mutex/innodb/log_flush_order_mutex YES YES
+wait/synch/mutex/innodb/log_sys_mutex YES YES
+wait/synch/mutex/innodb/mem_pool_mutex YES YES
+wait/synch/mutex/innodb/mutex_list_mutex YES YES
+wait/synch/mutex/innodb/os_mutex YES YES
+wait/synch/mutex/innodb/prepare_commit_mutex YES YES
+wait/synch/mutex/innodb/purge_sys_bh_mutex YES YES
+wait/synch/mutex/innodb/recv_sys_mutex YES YES
+wait/synch/mutex/innodb/rseg_mutex YES YES
+wait/synch/mutex/innodb/rw_lock_debug_mutex YES YES
+wait/synch/mutex/innodb/rw_lock_list_mutex YES YES
+wait/synch/mutex/innodb/rw_lock_mutex YES YES
+wait/synch/mutex/innodb/srv_dict_tmpfile_mutex YES YES
+wait/synch/mutex/innodb/srv_innodb_monitor_mutex YES YES
+wait/synch/mutex/innodb/srv_misc_tmpfile_mutex YES YES
+wait/synch/mutex/innodb/srv_monitor_file_mutex YES YES
+wait/synch/mutex/innodb/srv_sys_mutex YES YES
+wait/synch/mutex/innodb/srv_threads_mutex YES YES
+wait/synch/mutex/innodb/sync_thread_mutex YES YES
+wait/synch/mutex/innodb/trx_doublewrite_mutex YES YES
+wait/synch/mutex/innodb/trx_mutex YES YES
+wait/synch/mutex/innodb/trx_sys_mutex YES YES
+wait/synch/mutex/innodb/trx_undo_mutex YES YES
+wait/synch/mutex/innodb/ut_list_mutex YES YES
+wait/synch/mutex/memory/HP_SHARE::intern_lock YES YES
+wait/synch/mutex/myisam/MI_CHECK::print_msg YES YES
+wait/synch/mutex/myisam/MI_SORT_INFO::mutex YES YES
+wait/synch/mutex/myisam/MYISAM_SHARE::intern_lock YES YES
+wait/synch/mutex/myisammrg/MYRG_INFO::mutex YES YES
+wait/synch/mutex/mysys/BITMAP::mutex YES YES
+wait/synch/mutex/mysys/IO_CACHE::append_buffer_lock YES YES
+wait/synch/mutex/mysys/IO_CACHE::SHARE_mutex YES YES
+wait/synch/mutex/mysys/KEY_CACHE::cache_lock YES YES
+wait/synch/mutex/mysys/LOCK_alarm YES YES
+wait/synch/mutex/mysys/my_thread_var::mutex YES YES
+wait/synch/mutex/mysys/THR_LOCK::mutex YES YES
+wait/synch/mutex/mysys/THR_LOCK_charset YES YES
+wait/synch/mutex/mysys/THR_LOCK_heap YES YES
+wait/synch/mutex/mysys/THR_LOCK_lock YES YES
+wait/synch/mutex/mysys/THR_LOCK_malloc YES YES
+wait/synch/mutex/mysys/THR_LOCK_myisam YES YES
+wait/synch/mutex/mysys/THR_LOCK_myisam_mmap YES YES
+wait/synch/mutex/mysys/THR_LOCK_net YES YES
+wait/synch/mutex/mysys/THR_LOCK_open YES YES
+wait/synch/mutex/mysys/THR_LOCK_threads YES YES
+wait/synch/mutex/mysys/TMPDIR_mutex YES YES
+wait/synch/mutex/sql/Cversion_lock NO NO
+wait/synch/mutex/sql/DEBUG_SYNC::mutex NO NO
+wait/synch/mutex/sql/Delayed_insert::mutex NO NO
+wait/synch/mutex/sql/Event_scheduler::LOCK_scheduler_state NO NO
+wait/synch/mutex/sql/hash_filo::lock NO NO
+wait/synch/mutex/sql/HA_DATA_PARTITION::LOCK_auto_inc NO NO
+wait/synch/mutex/sql/LOCK_active_mi YES YES
+wait/synch/mutex/sql/LOCK_audit_mask YES YES
+wait/synch/mutex/sql/LOCK_connection_count YES YES
+wait/synch/mutex/sql/LOCK_crypt YES YES
+wait/synch/mutex/sql/LOCK_delayed_create YES YES
+wait/synch/mutex/sql/LOCK_delayed_insert YES YES
+wait/synch/mutex/sql/LOCK_delayed_status YES YES
+wait/synch/mutex/sql/LOCK_des_key_file YES YES
+wait/synch/mutex/sql/LOCK_error_log YES YES
+wait/synch/mutex/sql/LOCK_error_messages YES YES
+wait/synch/mutex/sql/LOCK_event_queue YES YES
+wait/synch/mutex/sql/LOCK_gdl YES YES
+wait/synch/mutex/sql/LOCK_global_system_variables YES YES
+wait/synch/mutex/sql/LOCK_manager YES YES
+wait/synch/mutex/sql/LOCK_open YES YES
+wait/synch/mutex/sql/LOCK_plugin YES YES
+wait/synch/mutex/sql/LOCK_prepared_stmt_count YES YES
+wait/synch/mutex/sql/LOCK_server_started YES YES
+wait/synch/mutex/sql/LOCK_slave_list YES YES
+wait/synch/mutex/sql/LOCK_status YES YES
+wait/synch/mutex/sql/LOCK_system_variables_hash YES YES
+wait/synch/mutex/sql/LOCK_table_share YES YES
+wait/synch/mutex/sql/LOCK_thread_count NO NO
+wait/synch/mutex/sql/LOCK_user_conn YES NO
+wait/synch/mutex/sql/LOCK_user_locks YES NO
+wait/synch/mutex/sql/LOCK_uuid_generator YES NO
+wait/synch/mutex/sql/LOCK_xid_cache YES NO
+wait/synch/mutex/sql/LOG::LOCK_log NO NO
+wait/synch/mutex/sql/LOG_INFO::lock YES YES
+wait/synch/mutex/sql/Master_info::data_lock NO NO
+wait/synch/mutex/sql/Master_info::run_lock YES YES
+wait/synch/mutex/sql/Master_info::sleep_lock NO NO
+wait/synch/mutex/sql/MDL_map::mutex NO NO
+wait/synch/mutex/sql/MDL_wait::LOCK_wait_status NO NO
+wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_index NO NO
+wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_prep_xids NO NO
+wait/synch/mutex/sql/MYSQL_RELAY_LOG::LOCK_index NO NO
+wait/synch/mutex/sql/PAGE::lock NO NO
+wait/synch/mutex/sql/Query_cache::structure_guard_mutex NO NO
+wait/synch/mutex/sql/Relay_log_info::data_lock NO NO
+wait/synch/mutex/sql/Relay_log_info::log_space_lock NO NO
+wait/synch/mutex/sql/Relay_log_info::pending_jobs_lock NO NO
+wait/synch/mutex/sql/Relay_log_info::run_lock NO NO
+wait/synch/mutex/sql/Relay_log_info::sleep_lock NO NO
+wait/synch/mutex/sql/Relay_log_info::temp_tables_lock NO NO
+wait/synch/mutex/sql/Slave_reporting_capability::err_lock NO NO
+wait/synch/mutex/sql/TABLE_SHARE::LOCK_ha_data NO NO
+wait/synch/mutex/sql/TC_LOG_MMAP::LOCK_active NO NO
+wait/synch/mutex/sql/TC_LOG_MMAP::LOCK_pool NO NO
+wait/synch/mutex/sql/TC_LOG_MMAP::LOCK_sync NO NO
+wait/synch/mutex/sql/THD::LOCK_thd_data NO NO
+wait/synch/mutex/sql/tz_LOCK NO NO
+wait/synch/mutex/sql/Worker_info::jobs_lock NO NO
+wait/synch/rwlock/innodb/btr_search_latch YES YES
+wait/synch/rwlock/innodb/buf_block_debug_latch YES YES
+wait/synch/rwlock/innodb/checkpoint_lock YES YES
+wait/synch/rwlock/innodb/dict_operation_lock YES YES
+wait/synch/rwlock/innodb/dict_table_stats YES YES
+wait/synch/rwlock/innodb/fil_space_latch YES YES
+wait/synch/rwlock/innodb/hash table locks YES YES
+wait/synch/rwlock/innodb/index_tree_rw_lock YES YES
+wait/synch/rwlock/innodb/trx_i_s_cache_lock YES YES
+wait/synch/rwlock/innodb/trx_purge_latch YES YES
+wait/synch/rwlock/myisam/MYISAM_SHARE::key_root_lock YES YES
+wait/synch/rwlock/myisam/MYISAM_SHARE::mmap_lock YES YES
+wait/synch/rwlock/sql/LOCK_dboptions YES YES
+wait/synch/rwlock/sql/LOCK_grant YES YES
+wait/synch/rwlock/sql/LOCK_system_variables_hash YES YES
+wait/synch/rwlock/sql/LOCK_sys_init_connect YES YES
+wait/synch/rwlock/sql/LOCK_sys_init_slave YES YES
+wait/synch/rwlock/sql/LOGGER::LOCK_logger YES YES
+wait/synch/rwlock/sql/MDL_context::LOCK_waiting_for YES YES
+wait/synch/rwlock/sql/MDL_lock::rwlock YES YES
+wait/synch/rwlock/sql/Query_cache_query::lock YES YES
+wait/synch/rwlock/sql/THR_LOCK_servers YES YES
+wait/synch/rwlock/sql/THR_LOCK_udf YES YES
=== added file 'mysql-test/suite/perfschema/t/setup_consumers_defaults-master.opt'
--- a/mysql-test/suite/perfschema/t/setup_consumers_defaults-master.opt 1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/perfschema/t/setup_consumers_defaults-master.opt 2011-11-16 07:05:50 +0000
@@ -0,0 +1,11 @@
+--loose-performance-schema-consumer-events-stages-current=OFF
+--loose-performance-schema-consumer-events-stages-history=ON
+--loose-performance-schema-consumer-events-stages-history-long=OFF
+--loose-performance-schema-consumer-events-statements-current=ON
+--loose-performance-schema-consumer-events-statements-history=OFF
+--loose-performance-schema-consumer-events-statements-history-long=ON
+--loose-performance-schema-consumer-events-waits-current=OFF
+--loose-performance-schema-consumer-events-waits-history=ON
+--loose-performance-schema-consumer-events-waits-history-long=OFF
+--loose-performance-schema-consumer-global-instrumentation=ON
+--loose-performance-schema-consumer-thread-instrumentation=ON
=== added file 'mysql-test/suite/perfschema/t/setup_consumers_defaults.test'
--- a/mysql-test/suite/perfschema/t/setup_consumers_defaults.test 1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/perfschema/t/setup_consumers_defaults.test 2011-11-16 07:05:50 +0000
@@ -0,0 +1,16 @@
+# Tests for PERFORMANCE_SCHEMA
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+# performance-schema-instrument = 'wait/synch/mutex/sql/% = NO'
+
+eval SELECT COUNT(*) = 6 AS 'Expect 1'
+FROM performance_schema.setup_consumers
+WHERE enabled = 'yes';
+
+eval SELECT COUNT(*) = 5 AS 'Expect 1'
+FROM performance_schema.setup_consumers
+WHERE enabled = 'no';
+
+SELECT * FROM performance_schema.setup_consumers ORDER BY name;
=== added file 'mysql-test/suite/perfschema/t/setup_instruments_defaults-master.opt'
--- a/mysql-test/suite/perfschema/t/setup_instruments_defaults-master.opt 1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/perfschema/t/setup_instruments_defaults-master.opt 2011-11-16 07:05:50 +0000
@@ -0,0 +1,22 @@
+--loose-performance-schema-instrument='%=ON'
+--loose-performance-schema-instrument='wait/synch/mutex/sql/% = OFF'
+--loose-performance-schema-instrument='wait/synch/mutex/sql/LOCK% = ON'
+--loose-performance-schema-instrument='wait/synch/mutex/sql/LOCK_thread_count = OFF'
+--loose-performance-schema-instrument=' wait/synch/mutex/sql/LOCK_user_conn = COUNTED'
+--loose-performance-schema-instrument='%wait/synch/mutex/sql/%user_locks = COUNTED'
+--loose-performance-schema-instrument='wait%/synch/mutex/sql/LOCK_uu%_genera%/ = COUNTED'
+--loose-performance-schema-instrument='%%wait/synch/mutex/sql/LOCK_xid_cache = COUNTED'
+--loose-performance-schema-instrument='%=FOO'
+--loose-performance-schema-instrument='%=%'
+--loose-performance-schema-instrument='%'
+--loose-performance-schema-instrument=''
+--loose-performance-schema-instrument='stage/sql/Waiting until MASTER_DELAY seconds after master executed event = COUNTED'
+--loose-performance-schema-instrument=' unknown%instrument/event/name with blanks = YES'
+--loose-performance-schema-instrument='unknown/instrument/event/name = TRUE'
+--loose-performance-schema-instrument='wait/synch/mutex/sql/LOG_INFO::lock = 1'
+--loose-performance-schema-instrument='wait/synch/mutex/sql/Master_info::data_lock = 0'
+--loose-performance-schema-instrument='wait/synch/mutex/sql/Master_info::run_lock = TRUE'
+--loose-performance-schema-instrument='wait/synch/mutex/sql/Master_info::sleep_lock = FALSE'
+--loose-performance-schema-instrument='wait/synch/cond/sql/MYSQL_BIN_LOG::COND_prep_xids = NO'
+--loose-performance-schema-instrument='wait/synch/cond/sql/MYSQL_BIN_LOG::update_cond = NO'
+
=== added file 'mysql-test/suite/perfschema/t/setup_instruments_defaults.test'
--- a/mysql-test/suite/perfschema/t/setup_instruments_defaults.test 1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/perfschema/t/setup_instruments_defaults.test 2011-11-16 07:05:50 +0000
@@ -0,0 +1,24 @@
+# Tests for PERFORMANCE_SCHEMA
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+# performance-schema-instrument = 'wait/synch/mutex/sql/% = NO'
+
+eval SELECT COUNT(*) = 31 AS 'Expect 1'
+FROM performance_schema.setup_instruments
+WHERE name LIKE 'wait/synch/mutex/sql/%' AND enabled = 'no' and timed = 'no';
+
+eval SELECT COUNT(*) = 1 AS 'Expect 1'
+FROM performance_schema.setup_instruments
+WHERE name = 'wait/synch/mutex/sql/LOCK_thread_count' AND enabled = 'no' and timed = 'no';
+
+eval SELECT COUNT(*) = 4 AS 'Expect 1'
+FROM performance_schema.setup_instruments
+WHERE name LIKE 'wait/synch/mutex/sql/LOCK_%' AND enabled = 'yes' and timed = 'no';
+
+eval SELECT COUNT(*) = 1 AS 'Expect 1'
+FROM performance_schema.setup_instruments
+WHERE name LIKE 'stage/%' AND enabled = 'yes' and timed = 'no';
+
+SELECT * FROM performance_schema.setup_instruments ORDER BY name;
=== modified file 'storage/perfschema/pfs_instr_class.cc'
--- a/storage/perfschema/pfs_instr_class.cc 2011-11-16 01:01:44 +0000
+++ b/storage/perfschema/pfs_instr_class.cc 2011-11-16 07:05:50 +0000
@@ -623,7 +623,7 @@ static void configure_instr_class(PFS_in
{
entry->m_enabled= e->m_enabled;
entry->m_timed= e->m_timed;
- match_length= max(e->m_name_length, match_length);
+ match_length= MY_MAX(e->m_name_length, match_length);
}
}
}
No bundle (reason: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-trunk-wl5461 branch (chris.powers:3428 to 3429) WL#5461 | Christopher Powers | 16 Nov |
