| List: | Commits | « Previous MessageNext Message » | |
| From: | Marc Alff | Date: | November 18 2008 12:04am |
| Subject: | bzr commit into mysql-6.0-perf branch (marc.alff:2737) | ||
| View as plain text | |||
#At file:///home/malff/BZR-TREE/mysql-6.0-perf/
2737 Marc Alff 2008-11-17
Fixed UPDATE on performance schema tables
modified:
mysql-test/suite/perfschema/r/dml_setup_instruments.result
storage/perfschema/ha_perfschema.h
storage/perfschema/pse_table.cc
storage/perfschema/pse_table.h
storage/perfschema/table_acts_waits_current.cc
storage/perfschema/table_acts_waits_current.h
storage/perfschema/table_performance_timers.cc
storage/perfschema/table_performance_timers.h
storage/perfschema/table_processlist.cc
storage/perfschema/table_processlist.h
storage/perfschema/table_setup_actors.cc
storage/perfschema/table_setup_actors.h
storage/perfschema/table_setup_consumers.cc
storage/perfschema/table_setup_consumers.h
storage/perfschema/table_setup_instruments.cc
storage/perfschema/table_setup_instruments.h
storage/perfschema/table_setup_timers.cc
storage/perfschema/table_setup_timers.h
=== modified file 'mysql-test/suite/perfschema/r/dml_setup_instruments.result'
--- a/mysql-test/suite/perfschema/r/dml_setup_instruments.result 2008-11-11 17:09:18 +0000
+++ b/mysql-test/suite/perfschema/r/dml_setup_instruments.result 2008-11-17 23:04:33 +0000
@@ -553,180 +553,180 @@ set timed='NO';
select * from performance_schema.setup_instruments;
NAME ENABLED TIMED
Wait/Synch/Mutex/Sql/LOCK_des_key_file NO NO
-Wait/Synch/Mutex/Sql/PAGE::lock YES YES
-Wait/Synch/Mutex/Sql/LOCK_sync YES YES
-Wait/Synch/Mutex/Sql/LOCK_active YES YES
-Wait/Synch/Mutex/Sql/LOCK_pool YES YES
-Wait/Synch/Mutex/Sql/LOCK_mysql_create_db YES YES
-Wait/Synch/Mutex/Sql/LOCK_open YES YES
-Wait/Synch/Mutex/Sql/LOCK_lock_db YES YES
-Wait/Synch/Mutex/Sql/LOCK_thread_count YES YES
-Wait/Synch/Mutex/Sql/LOCK_mapped_file YES YES
-Wait/Synch/Mutex/Sql/LOCK_status YES YES
-Wait/Synch/Mutex/Sql/LOCK_error_log YES YES
-Wait/Synch/Mutex/Sql/LOCK_delayed_insert YES YES
-Wait/Synch/Mutex/Sql/LOCK_uuid_short YES YES
-Wait/Synch/Mutex/Sql/LOCK_delayed_status YES YES
-Wait/Synch/Mutex/Sql/LOCK_delayed_create YES YES
-Wait/Synch/Mutex/Sql/LOCK_crypt YES YES
-Wait/Synch/Mutex/Sql/LOCK_timezone YES YES
-Wait/Synch/Mutex/Sql/LOCK_slave_list YES YES
-Wait/Synch/Mutex/Sql/LOCK_active_mi YES YES
-Wait/Synch/Mutex/Sql/LOCK_manager YES YES
-Wait/Synch/Mutex/Sql/LOCK_global_read_lock YES YES
-Wait/Synch/Mutex/Sql/LOCK_global_system_variables YES YES
-Wait/Synch/Mutex/Sql/LOCK_user_conn YES YES
-Wait/Synch/Mutex/Sql/LOCK_prepared_stmt_count YES YES
-Wait/Synch/Mutex/Sql/LOCK_connection_count YES YES
-Wait/Synch/Mutex/Sql/LOCK_server_started YES YES
-Wait/Synch/Mutex/Sql/LOCK_rpl_status YES YES
-Wait/Synch/Mutex/Sql/LOCK_delete YES YES
-Wait/Synch/Mutex/Sql/hash_filo::lock YES YES
-Wait/Synch/Mutex/Sql/LOCK_ha_data YES YES
-Wait/Synch/Mutex/Sql/LOG::LOCK_log YES YES
-Wait/Synch/Mutex/Sql/BINLOG::LOCK_index YES YES
-Wait/Synch/Mutex/Sql/BINLOG::LOCK_prep_xids YES YES
-Wait/Synch/Mutex/Sql/LOCK_logger YES YES
-Wait/Synch/Mutex/Sql/LOG_INFO_lock YES YES
-Wait/Synch/Mutex/Sql/LOCK_backupid YES YES
-Wait/Synch/Mutex/Sql/structure_guard_mutex YES YES
-Wait/Synch/Mutex/Sql/RLI_run_lock YES YES
-Wait/Synch/Mutex/Sql/RLI_data_lock YES YES
-Wait/Synch/Mutex/Sql/RLI_log_space_lock YES YES
-Wait/Synch/Mutex/Sql/MI_run_lock YES YES
-Wait/Synch/Mutex/Sql/MI_data_lock YES YES
-Wait/Synch/Mutex/Sql/LOCK_scheduler_state YES YES
-Wait/Synch/Mutex/Sql/LOCK_event_metadata YES YES
-Wait/Synch/Mutex/Sql/LOCK_event_queue YES YES
-Wait/Synch/Mutex/Sql/THR_LOCK_DDL_blocker YES YES
-Wait/Synch/Mutex/Sql/THR_LOCK_DDL_is_blocked YES YES
-Wait/Synch/Mutex/Sql/THR_LOCK_DDL_blocker_blocked YES YES
-Wait/Synch/Mutex/Sql/THR_LOCK_thread YES YES
-Wait/Synch/Mutex/Sql/THR_LOCK_caller YES YES
-Wait/Synch/Mutex/Sql/BRC_run_lock YES YES
-Wait/Synch/Mutex/Sql/DEBUG_SYNC::mutex YES YES
-Wait/Synch/Mutex/Sql/LOCK_user_locks YES YES
-Wait/Synch/Mutex/Sql/LOCK_mdl YES YES
-Wait/Synch/Mutex/Sql/LOCK_thd_add YES YES
-Wait/Synch/Mutex/Sql/LOCK_event_loop YES YES
-Wait/Synch/Mutex/Sql/Cversion_lock YES YES
-Wait/Synch/Mutex/Sql/LOCK_audit_mask YES YES
-Wait/Synch/Mutex/Sql/LOCK_xid_cache YES YES
-Wait/Synch/Mutex/Sql/Delayed_insert_mutex YES YES
-Wait/Synch/Mutex/Sql/LOCK_plugin YES YES
-Wait/Synch/Mutex/Sql/LOCK_gdl YES YES
-Wait/Synch/Mutex/Sql/tz_LOCK YES YES
-Wait/Synch/Rwlock/Sql/LOCK_grant 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/LOCK_system_variables_hash YES YES
-Wait/Synch/Rwlock/Sql/Query_cache_query::lock YES YES
-Wait/Synch/Cond/Sql/PAGE::cond YES YES
-Wait/Synch/Cond/Sql/COND_active YES YES
-Wait/Synch/Cond/Sql/COND_pool YES YES
-Wait/Synch/Cond/Sql/COND_server_started YES YES
-Wait/Synch/Cond/Sql/COND_refresh YES YES
-Wait/Synch/Cond/Sql/COND_thread_count YES YES
-Wait/Synch/Cond/Sql/COND_manager YES YES
-Wait/Synch/Cond/Sql/COND_global_read_lock YES YES
-Wait/Synch/Cond/Sql/COND_thread_cache YES YES
-Wait/Synch/Cond/Sql/COND_flush_thread_cache YES YES
-Wait/Synch/Cond/Sql/COND_rpl_status YES YES
-Wait/Synch/Cond/Sql/BINLOG::COND_prep_xids YES YES
-Wait/Synch/Cond/Sql/BINLOG::update_cond YES YES
-Wait/Synch/Cond/Sql/COND_cache_status_changed YES YES
-Wait/Synch/Cond/Sql/RLI_data_cond YES YES
-Wait/Synch/Cond/Sql/RLI_start_cond YES YES
-Wait/Synch/Cond/Sql/RLI_stop_cond YES YES
-Wait/Synch/Cond/Sql/RLI_log_space_cond YES YES
-Wait/Synch/Cond/Sql/MI_data_cond YES YES
-Wait/Synch/Cond/Sql/MI_start_cond YES YES
-Wait/Synch/Cond/Sql/MI_stop_cond YES YES
-Wait/Synch/Cond/Sql/Event_scheduler::COND_state YES YES
-Wait/Synch/Cond/Sql/COND_queue_state YES YES
-Wait/Synch/Cond/Sql/COND_DDL_blocker YES YES
-Wait/Synch/Cond/Sql/COND_process_blocked YES YES
-Wait/Synch/Cond/Sql/COND_DDL_blocker_blocked YES YES
-Wait/Synch/Cond/Sql/COND_thread_wait YES YES
-Wait/Synch/Cond/Sql/COND_caller_wait YES YES
-Wait/Synch/Cond/Sql/DEBUG_SYNC::cond YES YES
-Wait/Synch/Cond/Sql/ULL_cond YES YES
-Wait/Synch/Cond/Sql/Item_func_sleep::cond YES YES
-Wait/Synch/Cond/Sql/COND_mdl YES YES
-Wait/Synch/Cond/Sql/Delayed_insert_cond YES YES
-Wait/Synch/Cond/Sql/Delayed_insert_cond_client YES YES
-Wait/Synch/Mutex/mysys/KEY_CACHE::cache_lock 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/TMPDIR_mutex YES YES
-Wait/Synch/Mutex/mysys/LOCK_uuid_generator YES YES
-Wait/Synch/Mutex/mysys/BITMAP_mutex YES YES
-Wait/Synch/Mutex/mysys/LOCK_alarm YES YES
-Wait/Synch/Mutex/mysys/THD_LOCK_mutex YES YES
-Wait/Synch/Mutex/mysys/THR_LOCK_malloc YES YES
-Wait/Synch/Mutex/mysys/THR_LOCK_open YES YES
-Wait/Synch/Mutex/mysys/THR_LOCK_keycache YES YES
-Wait/Synch/Mutex/mysys/THR_LOCK_lock YES YES
-Wait/Synch/Mutex/mysys/THR_LOCK_isam YES YES
-Wait/Synch/Mutex/mysys/THR_LOCK_net YES YES
-Wait/Synch/Mutex/mysys/THR_LOCK_charset YES YES
-Wait/Synch/Mutex/mysys/THR_LOCK_time YES YES
-Wait/Synch/Mutex/mysys/THR_LOCK_isam YES YES
-Wait/Synch/Mutex/mysys/THR_LOCK_myisam YES YES
-Wait/Synch/Mutex/mysys/THR_LOCK_myisam_log YES YES
-Wait/Synch/Mutex/mysys/THR_LOCK_heap YES YES
-Wait/Synch/Mutex/mysys/THR_LOCK_threads YES YES
-Wait/Synch/Mutex/mysys/my_thread_var::mutex YES YES
-Wait/Synch/Rwlock/mysys/WT_RESOURCE::lock YES YES
-Wait/Synch/Rwlock/mysys/SAFE_HASH_mutex YES YES
-Wait/Synch/Cond/mysys/WT_RESOURCE::cond 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/COND_alarm YES YES
-Wait/Synch/Cond/mysys/THR_COND_threads YES YES
-Wait/Synch/Cond/mysys/my_thread_var::suspend YES YES
-Wait/Synch/Mutex/myisam/MI_SORT_INFO::mutex YES YES
-Wait/Synch/Mutex/myisam/MYISAM_SHARE::intern_lock 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/Cond/myisam/MI_SORT_INFO::cond YES YES
-Wait/Synch/Mutex/tina/tina_mutex YES YES
-Wait/Synch/Mutex/tina/TINA_SHARE::mutex YES YES
-Wait/Synch/Mutex/archive/archive_mutex YES YES
-Wait/Synch/Mutex/archive/ARCHIVE_SHARE::mutex YES YES
-Wait/Synch/Mutex/archive/azio_container::thresh_mutex YES YES
-Wait/Synch/Cond/archive/azio_container::threshhold YES YES
-Wait/Synch/Mutex/blackhole/blackhole_mutex YES YES
-Wait/Synch/Mutex/heap/HP_SHARE::intern_lock YES YES
-Wait/Synch/Mutex/Maria/MARIA_SHARE::key_del_lock YES YES
-Wait/Synch/Mutex/Maria/MARIA_SHARE::intern_lock YES YES
-Wait/Synch/Mutex/Maria/MARIA_FILE_BITMAP::bitmap_lock YES YES
-Wait/Synch/Mutex/Maria/MARIA_SORT_INFO::mutex YES YES
-Wait/Synch/Mutex/Maria/THR_LOCK_maria YES YES
-Wait/Synch/Mutex/Maria/LOCK_trn_list YES YES
-Wait/Synch/Mutex/Maria/TRN::state_lock YES YES
-Wait/Synch/Mutex/Maria/TABLOCKMAN::pool_mutex YES YES
-Wait/Synch/Mutex/Maria/LOCKED_TABLE::mutex YES YES
-Wait/Synch/Mutex/Maria/PAGECACHE::cache_lock YES YES
-Wait/Synch/Mutex/Maria/LOCK_checkpoint YES YES
-Wait/Synch/Mutex/Maria/translog_buffer::mutex YES YES
-Wait/Synch/Mutex/Maria/translog_d::sent_to_disk YES YES
-Wait/Synch/Mutex/Maria/translog_d:file_header YES YES
-Wait/Synch/Mutex/Maria/translog_d::unfinished_files YES YES
-Wait/Synch/Mutex/Maria/translog_d::purger YES YES
-Wait/Synch/Mutex/Maria/translog_d::log_flush YES YES
-Wait/Synch/Mutex/Maria/translog_d::dirty_buffer_mask YES YES
-Wait/Synch/Rwlock/Maria/MARIA_KEYDEF::root_lock YES YES
-Wait/Synch/Rwlock/Maria/MARIA_SHARE::mmap_lock YES YES
-Wait/Synch/Rwlock/Maria/MARIA_SHARE::key_del_cond YES YES
-Wait/Synch/Rwlock/Maria/translog_d::open_files YES YES
-Wait/Synch/Cond/Maria/MARIA_SHARE::intern_cond YES YES
-Wait/Synch/Cond/Maria/MARIA_FILE_BITMAP::bitmap_cond YES YES
-Wait/Synch/Cond/Maria/MARIA_SORT_INFO::cond YES YES
-Wait/Synch/Cond/Maria/COND_checkpoint YES YES
-Wait/Synch/Cond/Maria/translog_b::waiting_filling_buffer YES YES
-Wait/Synch/Cond/Maria/translog_d::log_flush YES YES
-Wait/Synch/Mutex/myisammrg/MYRG_INFO::mutex YES YES
+Wait/Synch/Mutex/Sql/PAGE::lock NO NO
+Wait/Synch/Mutex/Sql/LOCK_sync NO NO
+Wait/Synch/Mutex/Sql/LOCK_active NO NO
+Wait/Synch/Mutex/Sql/LOCK_pool NO NO
+Wait/Synch/Mutex/Sql/LOCK_mysql_create_db NO NO
+Wait/Synch/Mutex/Sql/LOCK_open NO NO
+Wait/Synch/Mutex/Sql/LOCK_lock_db NO NO
+Wait/Synch/Mutex/Sql/LOCK_thread_count NO NO
+Wait/Synch/Mutex/Sql/LOCK_mapped_file NO NO
+Wait/Synch/Mutex/Sql/LOCK_status NO NO
+Wait/Synch/Mutex/Sql/LOCK_error_log NO NO
+Wait/Synch/Mutex/Sql/LOCK_delayed_insert NO NO
+Wait/Synch/Mutex/Sql/LOCK_uuid_short NO NO
+Wait/Synch/Mutex/Sql/LOCK_delayed_status NO NO
+Wait/Synch/Mutex/Sql/LOCK_delayed_create NO NO
+Wait/Synch/Mutex/Sql/LOCK_crypt NO NO
+Wait/Synch/Mutex/Sql/LOCK_timezone NO NO
+Wait/Synch/Mutex/Sql/LOCK_slave_list NO NO
+Wait/Synch/Mutex/Sql/LOCK_active_mi NO NO
+Wait/Synch/Mutex/Sql/LOCK_manager NO NO
+Wait/Synch/Mutex/Sql/LOCK_global_read_lock NO NO
+Wait/Synch/Mutex/Sql/LOCK_global_system_variables NO NO
+Wait/Synch/Mutex/Sql/LOCK_user_conn NO NO
+Wait/Synch/Mutex/Sql/LOCK_prepared_stmt_count NO NO
+Wait/Synch/Mutex/Sql/LOCK_connection_count NO NO
+Wait/Synch/Mutex/Sql/LOCK_server_started NO NO
+Wait/Synch/Mutex/Sql/LOCK_rpl_status NO NO
+Wait/Synch/Mutex/Sql/LOCK_delete NO NO
+Wait/Synch/Mutex/Sql/hash_filo::lock NO NO
+Wait/Synch/Mutex/Sql/LOCK_ha_data NO NO
+Wait/Synch/Mutex/Sql/LOG::LOCK_log NO NO
+Wait/Synch/Mutex/Sql/BINLOG::LOCK_index NO NO
+Wait/Synch/Mutex/Sql/BINLOG::LOCK_prep_xids NO NO
+Wait/Synch/Mutex/Sql/LOCK_logger NO NO
+Wait/Synch/Mutex/Sql/LOG_INFO_lock NO NO
+Wait/Synch/Mutex/Sql/LOCK_backupid NO NO
+Wait/Synch/Mutex/Sql/structure_guard_mutex NO NO
+Wait/Synch/Mutex/Sql/RLI_run_lock NO NO
+Wait/Synch/Mutex/Sql/RLI_data_lock NO NO
+Wait/Synch/Mutex/Sql/RLI_log_space_lock NO NO
+Wait/Synch/Mutex/Sql/MI_run_lock NO NO
+Wait/Synch/Mutex/Sql/MI_data_lock NO NO
+Wait/Synch/Mutex/Sql/LOCK_scheduler_state NO NO
+Wait/Synch/Mutex/Sql/LOCK_event_metadata NO NO
+Wait/Synch/Mutex/Sql/LOCK_event_queue NO NO
+Wait/Synch/Mutex/Sql/THR_LOCK_DDL_blocker NO NO
+Wait/Synch/Mutex/Sql/THR_LOCK_DDL_is_blocked NO NO
+Wait/Synch/Mutex/Sql/THR_LOCK_DDL_blocker_blocked NO NO
+Wait/Synch/Mutex/Sql/THR_LOCK_thread NO NO
+Wait/Synch/Mutex/Sql/THR_LOCK_caller NO NO
+Wait/Synch/Mutex/Sql/BRC_run_lock NO NO
+Wait/Synch/Mutex/Sql/DEBUG_SYNC::mutex NO NO
+Wait/Synch/Mutex/Sql/LOCK_user_locks NO NO
+Wait/Synch/Mutex/Sql/LOCK_mdl NO NO
+Wait/Synch/Mutex/Sql/LOCK_thd_add NO NO
+Wait/Synch/Mutex/Sql/LOCK_event_loop NO NO
+Wait/Synch/Mutex/Sql/Cversion_lock NO NO
+Wait/Synch/Mutex/Sql/LOCK_audit_mask NO NO
+Wait/Synch/Mutex/Sql/LOCK_xid_cache NO NO
+Wait/Synch/Mutex/Sql/Delayed_insert_mutex NO NO
+Wait/Synch/Mutex/Sql/LOCK_plugin NO NO
+Wait/Synch/Mutex/Sql/LOCK_gdl NO NO
+Wait/Synch/Mutex/Sql/tz_LOCK NO NO
+Wait/Synch/Rwlock/Sql/LOCK_grant NO NO
+Wait/Synch/Rwlock/Sql/LOCK_sys_init_connect NO NO
+Wait/Synch/Rwlock/Sql/LOCK_sys_init_slave NO NO
+Wait/Synch/Rwlock/Sql/LOCK_system_variables_hash NO NO
+Wait/Synch/Rwlock/Sql/Query_cache_query::lock NO NO
+Wait/Synch/Cond/Sql/PAGE::cond NO NO
+Wait/Synch/Cond/Sql/COND_active NO NO
+Wait/Synch/Cond/Sql/COND_pool NO NO
+Wait/Synch/Cond/Sql/COND_server_started NO NO
+Wait/Synch/Cond/Sql/COND_refresh NO NO
+Wait/Synch/Cond/Sql/COND_thread_count NO NO
+Wait/Synch/Cond/Sql/COND_manager NO NO
+Wait/Synch/Cond/Sql/COND_global_read_lock NO NO
+Wait/Synch/Cond/Sql/COND_thread_cache NO NO
+Wait/Synch/Cond/Sql/COND_flush_thread_cache NO NO
+Wait/Synch/Cond/Sql/COND_rpl_status NO NO
+Wait/Synch/Cond/Sql/BINLOG::COND_prep_xids NO NO
+Wait/Synch/Cond/Sql/BINLOG::update_cond NO NO
+Wait/Synch/Cond/Sql/COND_cache_status_changed NO NO
+Wait/Synch/Cond/Sql/RLI_data_cond NO NO
+Wait/Synch/Cond/Sql/RLI_start_cond NO NO
+Wait/Synch/Cond/Sql/RLI_stop_cond NO NO
+Wait/Synch/Cond/Sql/RLI_log_space_cond NO NO
+Wait/Synch/Cond/Sql/MI_data_cond NO NO
+Wait/Synch/Cond/Sql/MI_start_cond NO NO
+Wait/Synch/Cond/Sql/MI_stop_cond NO NO
+Wait/Synch/Cond/Sql/Event_scheduler::COND_state NO NO
+Wait/Synch/Cond/Sql/COND_queue_state NO NO
+Wait/Synch/Cond/Sql/COND_DDL_blocker NO NO
+Wait/Synch/Cond/Sql/COND_process_blocked NO NO
+Wait/Synch/Cond/Sql/COND_DDL_blocker_blocked NO NO
+Wait/Synch/Cond/Sql/COND_thread_wait NO NO
+Wait/Synch/Cond/Sql/COND_caller_wait NO NO
+Wait/Synch/Cond/Sql/DEBUG_SYNC::cond NO NO
+Wait/Synch/Cond/Sql/ULL_cond NO NO
+Wait/Synch/Cond/Sql/Item_func_sleep::cond NO NO
+Wait/Synch/Cond/Sql/COND_mdl NO NO
+Wait/Synch/Cond/Sql/Delayed_insert_cond NO NO
+Wait/Synch/Cond/Sql/Delayed_insert_cond_client NO NO
+Wait/Synch/Mutex/mysys/KEY_CACHE::cache_lock NO NO
+Wait/Synch/Mutex/mysys/IO_CACHE::append_buffer_lock NO NO
+Wait/Synch/Mutex/mysys/IO_CACHE::SHARE_mutex NO NO
+Wait/Synch/Mutex/mysys/TMPDIR_mutex NO NO
+Wait/Synch/Mutex/mysys/LOCK_uuid_generator NO NO
+Wait/Synch/Mutex/mysys/BITMAP_mutex NO NO
+Wait/Synch/Mutex/mysys/LOCK_alarm NO NO
+Wait/Synch/Mutex/mysys/THD_LOCK_mutex NO NO
+Wait/Synch/Mutex/mysys/THR_LOCK_malloc NO NO
+Wait/Synch/Mutex/mysys/THR_LOCK_open NO NO
+Wait/Synch/Mutex/mysys/THR_LOCK_keycache NO NO
+Wait/Synch/Mutex/mysys/THR_LOCK_lock NO NO
+Wait/Synch/Mutex/mysys/THR_LOCK_isam NO NO
+Wait/Synch/Mutex/mysys/THR_LOCK_net NO NO
+Wait/Synch/Mutex/mysys/THR_LOCK_charset NO NO
+Wait/Synch/Mutex/mysys/THR_LOCK_time NO NO
+Wait/Synch/Mutex/mysys/THR_LOCK_isam NO NO
+Wait/Synch/Mutex/mysys/THR_LOCK_myisam NO NO
+Wait/Synch/Mutex/mysys/THR_LOCK_myisam_log NO NO
+Wait/Synch/Mutex/mysys/THR_LOCK_heap NO NO
+Wait/Synch/Mutex/mysys/THR_LOCK_threads NO NO
+Wait/Synch/Mutex/mysys/my_thread_var::mutex NO NO
+Wait/Synch/Rwlock/mysys/WT_RESOURCE::lock NO NO
+Wait/Synch/Rwlock/mysys/SAFE_HASH_mutex NO NO
+Wait/Synch/Cond/mysys/WT_RESOURCE::cond NO NO
+Wait/Synch/Cond/mysys/IO_CACHE_SHARE::cond NO NO
+Wait/Synch/Cond/mysys/IO_CACHE_SHARE::cond_writer NO NO
+Wait/Synch/Cond/mysys/COND_alarm NO NO
+Wait/Synch/Cond/mysys/THR_COND_threads NO NO
+Wait/Synch/Cond/mysys/my_thread_var::suspend NO NO
+Wait/Synch/Mutex/myisam/MI_SORT_INFO::mutex NO NO
+Wait/Synch/Mutex/myisam/MYISAM_SHARE::intern_lock NO NO
+Wait/Synch/Rwlock/myisam/MYISAM_SHARE::key_root_lock NO NO
+Wait/Synch/Rwlock/myisam/MYISAM_SHARE::mmap_lock NO NO
+Wait/Synch/Cond/myisam/MI_SORT_INFO::cond NO NO
+Wait/Synch/Mutex/tina/tina_mutex NO NO
+Wait/Synch/Mutex/tina/TINA_SHARE::mutex NO NO
+Wait/Synch/Mutex/archive/archive_mutex NO NO
+Wait/Synch/Mutex/archive/ARCHIVE_SHARE::mutex NO NO
+Wait/Synch/Mutex/archive/azio_container::thresh_mutex NO NO
+Wait/Synch/Cond/archive/azio_container::threshhold NO NO
+Wait/Synch/Mutex/blackhole/blackhole_mutex NO NO
+Wait/Synch/Mutex/heap/HP_SHARE::intern_lock NO NO
+Wait/Synch/Mutex/Maria/MARIA_SHARE::key_del_lock NO NO
+Wait/Synch/Mutex/Maria/MARIA_SHARE::intern_lock NO NO
+Wait/Synch/Mutex/Maria/MARIA_FILE_BITMAP::bitmap_lock NO NO
+Wait/Synch/Mutex/Maria/MARIA_SORT_INFO::mutex NO NO
+Wait/Synch/Mutex/Maria/THR_LOCK_maria NO NO
+Wait/Synch/Mutex/Maria/LOCK_trn_list NO NO
+Wait/Synch/Mutex/Maria/TRN::state_lock NO NO
+Wait/Synch/Mutex/Maria/TABLOCKMAN::pool_mutex NO NO
+Wait/Synch/Mutex/Maria/LOCKED_TABLE::mutex NO NO
+Wait/Synch/Mutex/Maria/PAGECACHE::cache_lock NO NO
+Wait/Synch/Mutex/Maria/LOCK_checkpoint NO NO
+Wait/Synch/Mutex/Maria/translog_buffer::mutex NO NO
+Wait/Synch/Mutex/Maria/translog_d::sent_to_disk NO NO
+Wait/Synch/Mutex/Maria/translog_d:file_header NO NO
+Wait/Synch/Mutex/Maria/translog_d::unfinished_files NO NO
+Wait/Synch/Mutex/Maria/translog_d::purger NO NO
+Wait/Synch/Mutex/Maria/translog_d::log_flush NO NO
+Wait/Synch/Mutex/Maria/translog_d::dirty_buffer_mask NO NO
+Wait/Synch/Rwlock/Maria/MARIA_KEYDEF::root_lock NO NO
+Wait/Synch/Rwlock/Maria/MARIA_SHARE::mmap_lock NO NO
+Wait/Synch/Rwlock/Maria/MARIA_SHARE::key_del_cond NO NO
+Wait/Synch/Rwlock/Maria/translog_d::open_files NO NO
+Wait/Synch/Cond/Maria/MARIA_SHARE::intern_cond NO NO
+Wait/Synch/Cond/Maria/MARIA_FILE_BITMAP::bitmap_cond NO NO
+Wait/Synch/Cond/Maria/MARIA_SORT_INFO::cond NO NO
+Wait/Synch/Cond/Maria/COND_checkpoint NO NO
+Wait/Synch/Cond/Maria/translog_b::waiting_filling_buffer NO NO
+Wait/Synch/Cond/Maria/translog_d::log_flush NO NO
+Wait/Synch/Mutex/myisammrg/MYRG_INFO::mutex NO NO
update performance_schema.setup_instruments
set enabled='YES', timed='YES';
delete from performance_schema.setup_instruments;
=== modified file 'storage/perfschema/ha_perfschema.h'
--- a/storage/perfschema/ha_perfschema.h 2008-11-13 03:12:30 +0000
+++ b/storage/perfschema/ha_perfschema.h 2008-11-17 23:04:33 +0000
@@ -61,7 +61,7 @@ public:
ulonglong table_flags() const
{
// TODO: HA_REC_NOT_IN_SEQ ?
- return HA_NO_TRANSACTIONS;
+ return HA_NO_TRANSACTIONS | HA_NO_AUTO_INCREMENT ;
}
/** @brief
=== modified file 'storage/perfschema/pse_table.cc'
--- a/storage/perfschema/pse_table.cc 2008-11-13 03:12:30 +0000
+++ b/storage/perfschema/pse_table.cc 2008-11-17 23:04:33 +0000
@@ -61,10 +61,14 @@ int pse_table::read_row(TABLE *table,
{
int result;
my_bitmap_map *org_bitmap;
+ bool read_all;
- // TODO: find why is this necessary ?
+ /* We must read all columns in case a table is opened for update */
+ read_all= !bitmap_is_clear_all(table->write_set);
+
+ /* We internally write to Fields to support the read interface */
org_bitmap= dbug_tmp_use_all_columns(table, table->write_set);
- result= read_row_values(table, buf, fields);
+ result= read_row_values(table, buf, fields, read_all);
dbug_tmp_restore_column_map(table->write_set, org_bitmap);
return result;
@@ -78,7 +82,7 @@ int pse_table::update_row(TABLE *table,
int result;
my_bitmap_map *org_bitmap;
- // TODO: find why is this necessary ?
+ /* We internally read from Fields to support the write interface */
org_bitmap= dbug_tmp_use_all_columns(table, table->read_set);
result= update_row_values(table, old_buf, new_buf, fields);
dbug_tmp_restore_column_map(table->read_set, org_bitmap);
=== modified file 'storage/perfschema/pse_table.h'
--- a/storage/perfschema/pse_table.h 2008-11-13 03:12:30 +0000
+++ b/storage/perfschema/pse_table.h 2008-11-17 23:04:33 +0000
@@ -42,7 +42,8 @@ public:
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
- Field **fields) = 0;
+ Field **fields,
+ bool read_all) = 0;
virtual int update_row_values(TABLE *table,
const unsigned char *old_buf,
=== modified file 'storage/perfschema/table_acts_waits_current.cc'
--- a/storage/perfschema/table_acts_waits_current.cc 2008-11-13 03:12:30 +0000
+++ b/storage/perfschema/table_acts_waits_current.cc 2008-11-17 23:04:33 +0000
@@ -138,7 +138,8 @@ void table_acts_waits_current::make_row(
int table_acts_waits_current::read_row_values(TABLE *table,
unsigned char *buf,
- Field **fields)
+ Field **fields,
+ bool read_all)
{
Field *f;
Field_long *col_thread_id;
@@ -164,7 +165,7 @@ int table_acts_waits_current::read_row_v
{
f= *fields;
- if (bitmap_is_set(table->read_set, f->field_index))
+ if (read_all || bitmap_is_set(table->read_set, f->field_index))
{
switch(f->field_index)
{
=== modified file 'storage/perfschema/table_acts_waits_current.h'
--- a/storage/perfschema/table_acts_waits_current.h 2008-11-13 03:12:30 +0000
+++ b/storage/perfschema/table_acts_waits_current.h 2008-11-17 23:04:33 +0000
@@ -53,7 +53,10 @@ public:
virtual void set_position(const void *ref);
protected:
- virtual int read_row_values(TABLE *table, unsigned char *buf, Field **fields);
+ virtual int read_row_values(TABLE *table,
+ unsigned char *buf,
+ Field **fields,
+ bool read_all);
protected:
table_acts_waits_current();
=== modified file 'storage/perfschema/table_performance_timers.cc'
--- a/storage/perfschema/table_performance_timers.cc 2008-11-13 03:12:30 +0000
+++ b/storage/perfschema/table_performance_timers.cc 2008-11-17 23:04:33 +0000
@@ -131,7 +131,8 @@ void table_performance_timers::set_posit
int table_performance_timers::read_row_values(TABLE *table,
unsigned char *buf,
- Field **fields)
+ Field **fields,
+ bool read_all)
{
Field *f;
Field_enum *col_timer_name;
@@ -149,7 +150,7 @@ int table_performance_timers::read_row_v
{
f= *fields;
- if (bitmap_is_set(table->read_set, f->field_index))
+ if (read_all || bitmap_is_set(table->read_set, f->field_index))
{
switch(f->field_index)
{
=== modified file 'storage/perfschema/table_performance_timers.h'
--- a/storage/perfschema/table_performance_timers.h 2008-11-13 03:12:30 +0000
+++ b/storage/perfschema/table_performance_timers.h 2008-11-17 23:04:33 +0000
@@ -44,7 +44,10 @@ public:
virtual void set_position(const void *ref);
protected:
- virtual int read_row_values(TABLE *table, unsigned char *buf, Field **fields);
+ virtual int read_row_values(TABLE *table,
+ unsigned char *buf,
+ Field **fields,
+ bool read_all);
protected:
table_performance_timers();
=== modified file 'storage/perfschema/table_processlist.cc'
--- a/storage/perfschema/table_processlist.cc 2008-11-13 03:12:30 +0000
+++ b/storage/perfschema/table_processlist.cc 2008-11-17 23:04:33 +0000
@@ -110,7 +110,8 @@ void table_processlist::make_row(PSE_thr
int table_processlist::read_row_values(TABLE *table,
unsigned char *buf,
- Field **fields)
+ Field **fields,
+ bool read_all)
{
Field *f;
Field_long *col_thread_internal_id;
@@ -127,7 +128,7 @@ int table_processlist::read_row_values(T
{
f= *fields;
- if (bitmap_is_set(table->read_set, f->field_index))
+ if (read_all || bitmap_is_set(table->read_set, f->field_index))
{
switch(f->field_index)
{
=== modified file 'storage/perfschema/table_processlist.h'
--- a/storage/perfschema/table_processlist.h 2008-11-13 03:12:30 +0000
+++ b/storage/perfschema/table_processlist.h 2008-11-17 23:04:33 +0000
@@ -46,7 +46,10 @@ public:
virtual void set_position(const void *ref);
protected:
- virtual int read_row_values(TABLE *table, unsigned char *buf, Field **fields);
+ virtual int read_row_values(TABLE *table,
+ unsigned char *buf,
+ Field **fields,
+ bool read_all);
protected:
table_processlist();
=== modified file 'storage/perfschema/table_setup_actors.cc'
--- a/storage/perfschema/table_setup_actors.cc 2008-11-13 03:12:30 +0000
+++ b/storage/perfschema/table_setup_actors.cc 2008-11-17 23:04:33 +0000
@@ -94,7 +94,8 @@ void table_setup_actors::set_position(co
int table_setup_actors::read_row_values(TABLE *table,
unsigned char *buf,
- Field **fields)
+ Field **fields,
+ bool read_all)
{
Field *f;
Field_enum *col_type;
@@ -113,7 +114,7 @@ int table_setup_actors::read_row_values(
{
f= *fields;
- if (bitmap_is_set(table->read_set, f->field_index))
+ if (read_all || bitmap_is_set(table->read_set, f->field_index))
{
switch(f->field_index)
{
=== modified file 'storage/perfschema/table_setup_actors.h'
--- a/storage/perfschema/table_setup_actors.h 2008-11-13 03:12:30 +0000
+++ b/storage/perfschema/table_setup_actors.h 2008-11-17 23:04:33 +0000
@@ -47,7 +47,8 @@ public:
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
- Field **fields);
+ Field **fields,
+ bool read_all);
virtual int update_row_values(TABLE *table,
const unsigned char *old_buf,
=== modified file 'storage/perfschema/table_setup_consumers.cc'
--- a/storage/perfschema/table_setup_consumers.cc 2008-11-13 03:12:30 +0000
+++ b/storage/perfschema/table_setup_consumers.cc 2008-11-17 23:04:33 +0000
@@ -102,7 +102,8 @@ void table_setup_consumers::set_position
int table_setup_consumers::read_row_values(TABLE *table,
unsigned char *buf,
- Field **fields)
+ Field **fields,
+ bool read_all)
{
Field *f;
Field_varstring *col_name;
@@ -122,7 +123,7 @@ int table_setup_consumers::read_row_valu
{
f= *fields;
- if (bitmap_is_set(table->read_set, f->field_index))
+ if (read_all || bitmap_is_set(table->read_set, f->field_index))
{
switch(f->field_index)
{
=== modified file 'storage/perfschema/table_setup_consumers.h'
--- a/storage/perfschema/table_setup_consumers.h 2008-11-13 03:12:30 +0000
+++ b/storage/perfschema/table_setup_consumers.h 2008-11-17 23:04:33 +0000
@@ -44,7 +44,8 @@ public:
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
- Field **fields);
+ Field **fields,
+ bool read_all);
virtual int update_row_values(TABLE *table,
const unsigned char *old_buf,
=== modified file 'storage/perfschema/table_setup_instruments.cc'
--- a/storage/perfschema/table_setup_instruments.cc 2008-11-13 03:12:30 +0000
+++ b/storage/perfschema/table_setup_instruments.cc 2008-11-17 23:04:33 +0000
@@ -115,7 +115,8 @@ void table_setup_instruments::make_row(P
int table_setup_instruments::read_row_values(TABLE *table,
unsigned char *buf,
- Field **fields)
+ Field **fields,
+ bool read_all)
{
Field *f;
Field_varstring *col_name;
@@ -134,7 +135,7 @@ int table_setup_instruments::read_row_va
{
f= *fields;
- if (bitmap_is_set(table->read_set, f->field_index))
+ if (read_all || bitmap_is_set(table->read_set, f->field_index))
{
switch(f->field_index)
{
=== modified file 'storage/perfschema/table_setup_instruments.h'
--- a/storage/perfschema/table_setup_instruments.h 2008-11-13 03:12:30 +0000
+++ b/storage/perfschema/table_setup_instruments.h 2008-11-17 23:04:33 +0000
@@ -46,7 +46,8 @@ public:
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
- Field **fields);
+ Field **fields,
+ bool read_all);
virtual int update_row_values(TABLE *table,
const unsigned char *old_buf,
=== modified file 'storage/perfschema/table_setup_timers.cc'
--- a/storage/perfschema/table_setup_timers.cc 2008-11-13 03:12:30 +0000
+++ b/storage/perfschema/table_setup_timers.cc 2008-11-17 23:04:33 +0000
@@ -95,7 +95,8 @@ void table_setup_timers::set_position(co
int table_setup_timers::read_row_values(TABLE *table,
unsigned char *buf,
- Field **fields)
+ Field **fields,
+ bool read_all)
{
Field *f;
Field_varstring *col_name;
@@ -113,7 +114,7 @@ int table_setup_timers::read_row_values(
{
f= *fields;
- if (bitmap_is_set(table->read_set, f->field_index))
+ if (read_all || bitmap_is_set(table->read_set, f->field_index))
{
switch(f->field_index)
{
=== modified file 'storage/perfschema/table_setup_timers.h'
--- a/storage/perfschema/table_setup_timers.h 2008-11-13 03:12:30 +0000
+++ b/storage/perfschema/table_setup_timers.h 2008-11-17 23:04:33 +0000
@@ -44,7 +44,8 @@ public:
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
- Field **fields);
+ Field **fields,
+ bool read_all);
virtual int update_row_values(TABLE *table,
const unsigned char *old_buf,
| Thread | ||
|---|---|---|
| • bzr commit into mysql-6.0-perf branch (marc.alff:2737) | Marc Alff | 18 Nov |
© 1995-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
Page generated in 0.703 sec. using MySQL 5.1.14-beta-log