From: Christopher Powers Date: August 20 2010 2:30pm Subject: bzr push into mysql-5.5-bugfixing branch (chris.powers:3189) List-Archive: http://lists.mysql.com/commits/116417 Message-Id: <20100820143048.25FD11DB01EA@xeno.mysql.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6133041556503924703==" --===============6133041556503924703== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline 3189 Christopher Powers 2010-08-20 [merge] merge removed: mysql-test/include/have_thread_concurrency.inc mysql-test/suite/rpl/t/rpl_mixed_row_innodb.test added: mysql-test/r/ctype_utf16_def.result mysql-test/suite/rpl_ndb/t/rpl_ndb_stm_innodb-slave.opt mysql-test/t/ctype_utf16_def-master.opt mysql-test/t/ctype_utf16_def.test sql/sql_reload.cc sql/sql_reload.h modified: .bzrignore client/mysql.cc config/ac-macros/plugins.m4 configure.in include/my_pthread.h include/mysql/psi/mysql_thread.h libmysqld/CMakeLists.txt libmysqld/Makefile.am mysql-test/CMakeLists.txt mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test mysql-test/extra/binlog_tests/mix_innodb_myisam_side_effects.test mysql-test/extra/rpl_tests/rpl_drop_create_temp_table.inc mysql-test/extra/rpl_tests/rpl_drop_create_temp_table.test mysql-test/extra/rpl_tests/rpl_innodb.test mysql-test/include/check_no_concurrent_insert.inc mysql-test/include/ctype_numconv.inc mysql-test/include/handler.inc mysql-test/include/mix1.inc mysql-test/r/case.result mysql-test/r/ctype_binary.result mysql-test/r/ctype_cp1251.result mysql-test/r/ctype_cp932_binlog_stm.result mysql-test/r/ctype_latin1.result mysql-test/r/ctype_ucs.result mysql-test/r/ctype_utf32.result mysql-test/r/ctype_utf8.result mysql-test/r/events_trans.result mysql-test/r/flush.result mysql-test/r/func_str.result mysql-test/r/information_schema_inno.result mysql-test/r/mdl_sync.result mysql-test/r/mysql.result mysql-test/r/mysqlbinlog.result mysql-test/r/query_cache.result mysql-test/r/schema.result mysql-test/r/sp-lock.result mysql-test/r/sp-threads.result mysql-test/suite/binlog/r/binlog_database.result mysql-test/suite/binlog/r/binlog_innodb_row.result mysql-test/suite/binlog/r/binlog_row_binlog.result mysql-test/suite/binlog/r/binlog_row_drop_tbl.result mysql-test/suite/binlog/r/binlog_row_drop_tmp_tbl.result mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result mysql-test/suite/binlog/r/binlog_stm_binlog.result mysql-test/suite/binlog/r/binlog_stm_blackhole.result mysql-test/suite/binlog/r/binlog_stm_drop_tbl.result mysql-test/suite/binlog/r/binlog_stm_drop_tmp_tbl.result mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result mysql-test/suite/binlog/r/binlog_stm_row.result mysql-test/suite/binlog/t/binlog_stm_row.test mysql-test/suite/funcs_1/datadict/processlist_val.inc mysql-test/suite/funcs_1/r/processlist_val_no_prot.result mysql-test/suite/funcs_1/r/processlist_val_ps.result mysql-test/suite/funcs_2/charset/charset_master.test mysql-test/suite/funcs_2/r/innodb_charset.result mysql-test/suite/funcs_2/r/memory_charset.result mysql-test/suite/funcs_2/r/myisam_charset.result mysql-test/suite/funcs_2/t/disabled.def mysql-test/suite/innodb/t/innodb-lock.test mysql-test/suite/parts/t/partition_debug_sync_innodb.test mysql-test/suite/perfschema/r/binlog_mix.result mysql-test/suite/perfschema/r/binlog_row.result mysql-test/suite/perfschema/r/binlog_stmt.result mysql-test/suite/perfschema/r/dml_setup_instruments.result mysql-test/suite/perfschema/r/server_init.result mysql-test/suite/rpl/r/rpl_conditional_comments.result mysql-test/suite/rpl/r/rpl_drop_if_exists.result mysql-test/suite/rpl/r/rpl_mixed_drop_create_temp_table.result mysql-test/suite/rpl/r/rpl_mixed_implicit_commit_binlog.result mysql-test/suite/rpl/r/rpl_mixed_mixing_engines.result mysql-test/suite/rpl/r/rpl_non_direct_mixed_mixing_engines.result mysql-test/suite/rpl/r/rpl_non_direct_row_mixing_engines.result mysql-test/suite/rpl/r/rpl_non_direct_stm_mixing_engines.result mysql-test/suite/rpl/r/rpl_row_drop.result mysql-test/suite/rpl/r/rpl_row_drop_create_temp_table.result mysql-test/suite/rpl/r/rpl_row_implicit_commit_binlog.result mysql-test/suite/rpl/r/rpl_row_log.result mysql-test/suite/rpl/r/rpl_row_log_innodb.result mysql-test/suite/rpl/r/rpl_row_mixing_engines.result mysql-test/suite/rpl/r/rpl_row_mysqlbinlog.result mysql-test/suite/rpl/r/rpl_row_show_relaylog_events.result mysql-test/suite/rpl/r/rpl_server_id.result mysql-test/suite/rpl/r/rpl_sp.result mysql-test/suite/rpl/r/rpl_stm_drop_create_temp_table.result mysql-test/suite/rpl/r/rpl_stm_implicit_commit_binlog.result mysql-test/suite/rpl/r/rpl_stm_log.result mysql-test/suite/rpl/r/rpl_stm_mix_show_relaylog_events.result mysql-test/suite/rpl/r/rpl_stm_mixing_engines.result mysql-test/suite/rpl/r/rpl_temp_table_mix_row.result mysql-test/suite/rpl/t/rpl_savepoint.test mysql-test/suite/rpl/t/rpl_sp.test mysql-test/suite/rpl/t/rpl_stm_innodb.test mysql-test/suite/rpl/t/rpl_view_multi.test mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_basic.result mysql-test/suite/rpl_ndb/r/rpl_ndb_mixed_implicit_commit_binlog.result mysql-test/suite/rpl_ndb/r/rpl_ndb_row_implicit_commit_binlog.result mysql-test/suite/rpl_ndb/t/disabled.def mysql-test/suite/rpl_ndb/t/rpl_ndb_2other-slave.opt mysql-test/suite/sys_vars/r/concurrent_insert_func.result mysql-test/suite/sys_vars/r/query_cache_wlock_invalidate_func.result mysql-test/suite/sys_vars/t/concurrent_insert_func.test mysql-test/suite/sys_vars/t/delayed_insert_limit_func.test mysql-test/suite/sys_vars/t/query_cache_wlock_invalidate_func.test mysql-test/suite/sys_vars/t/sql_low_priority_updates_func.test mysql-test/suite/sys_vars/t/thread_concurrency_basic.test mysql-test/t/case.test mysql-test/t/ctype_utf32.test mysql-test/t/ctype_utf8.test mysql-test/t/delayed.test mysql-test/t/disabled.def mysql-test/t/events_trans.test mysql-test/t/flush.test mysql-test/t/func_str.test mysql-test/t/information_schema.test mysql-test/t/information_schema_inno.test mysql-test/t/innodb_mysql_lock.test mysql-test/t/innodb_mysql_lock2.test mysql-test/t/insert_notembedded.test mysql-test/t/kill.test mysql-test/t/lock_multi.test mysql-test/t/lock_sync.test mysql-test/t/mdl_sync.test mysql-test/t/merge-big.test mysql-test/t/multi_update.test mysql-test/t/mysql.test mysql-test/t/query_cache.test mysql-test/t/query_cache_28249.test mysql-test/t/schema.test mysql-test/t/sp-lock.test mysql-test/t/sp_notembedded.test mysql-test/t/sp_sync.test mysql-test/t/status.test mysql-test/t/trigger_notembedded.test mysql-test/t/view.test mysys/thr_lock.c mysys/thr_rwlock.c scripts/CMakeLists.txt scripts/mysqlaccess.conf* sql/CMakeLists.txt sql/Makefile.am sql/datadict.cc sql/event_db_repository.cc sql/events.cc sql/ha_ndbcluster.cc sql/ha_ndbcluster_binlog.cc sql/ha_ndbcluster_binlog.h sql/handler.cc sql/handler.h sql/item.h sql/item_cmpfunc.cc sql/item_func.cc sql/item_strfunc.cc sql/item_strfunc.h sql/lock.cc sql/lock.h sql/log.cc sql/log_event.cc sql/mdl.cc sql/mdl.h sql/mysqld.cc sql/mysqld.h sql/sql_admin.cc sql/sql_base.cc sql/sql_base.h sql/sql_class.cc sql/sql_handler.cc sql/sql_insert.cc sql/sql_lex.cc sql/sql_lex.h sql/sql_parse.cc sql/sql_parse.h sql/sql_partition.cc sql/sql_plugin.cc sql/sql_rename.cc sql/sql_servers.cc sql/sql_show.cc sql/sql_table.cc sql/sql_table.h sql/sql_test.cc sql/sql_trigger.cc sql/sql_truncate.cc sql/sql_view.cc sql/sql_yacc.yy sql/sys_vars.cc sql/table.cc sql/table.h storage/innobase/plug.in storage/myisam/ft_stopwords.c === modified file 'scripts/mysqlaccess.conf' (properties changed: -x to +x) === modified file 'storage/perfschema/pfs.cc' --- a/storage/perfschema/pfs.cc 2010-08-12 09:51:58 +0000 +++ b/storage/perfschema/pfs.cc 2010-08-19 22:24:07 +0000 @@ -1625,7 +1625,7 @@ static void end_mutex_wait_v1(PSI_mutex_ if (flag_events_waits_history_long) insert_events_waits_history_long(wait); - if (rc == 0) + if (rc == 0 && wait->m_timer_state == TIMER_STATE_TIMED) { /* Thread safe: we are protected by the instrumented mutex */ PFS_single_stat_chain *stat; @@ -1635,9 +1635,8 @@ static void end_mutex_wait_v1(PSI_mutex_ ulonglong wait_time= wait->m_timer_end - wait->m_timer_start; aggregate_single_stat_chain(&mutex->m_wait_stat, wait_time); - stat= find_per_thread_mutex_class_wait_stat(wait->m_thread, - mutex->m_class); - aggregate_single_stat_chain(stat, wait_time); + stat= find_per_thread_mutex_class_wait_stat(wait->m_thread, mutex->m_class); + aggregate_single_stat_chain(stat, wait_time); } wait->m_thread->m_wait_locker_count--; } @@ -1690,11 +1689,13 @@ static void end_rwlock_rdwait_v1(PSI_rwl rwlock->m_writer= NULL; rwlock->m_readers++; - ulonglong wait_time= wait->m_timer_end - wait->m_timer_start; - aggregate_single_stat_chain(&rwlock->m_wait_stat, wait_time); - stat= find_per_thread_rwlock_class_wait_stat(wait->m_thread, - rwlock->m_class); - aggregate_single_stat_chain(stat, wait_time); + if (wait->m_timer_state == TIMER_STATE_TIMED) + { + ulonglong wait_time= wait->m_timer_end - wait->m_timer_start; + aggregate_single_stat_chain(&rwlock->m_wait_stat, wait_time); + stat= find_per_thread_rwlock_class_wait_stat(wait->m_thread, rwlock->m_class); + aggregate_single_stat_chain(stat, wait_time); + } } wait->m_thread->m_wait_locker_count--; } @@ -1742,11 +1743,13 @@ static void end_rwlock_wrwait_v1(PSI_rwl rwlock->m_readers= 0; rwlock->m_last_read= 0; - ulonglong wait_time= wait->m_timer_end - wait->m_timer_start; - aggregate_single_stat_chain(&rwlock->m_wait_stat, wait_time); - stat= find_per_thread_rwlock_class_wait_stat(wait->m_thread, - rwlock->m_class); - aggregate_single_stat_chain(stat, wait_time); + if (wait->m_timer_state == TIMER_STATE_TIMED) + { + ulonglong wait_time= wait->m_timer_end - wait->m_timer_start; + aggregate_single_stat_chain(&rwlock->m_wait_stat, wait_time); + stat= find_per_thread_rwlock_class_wait_stat(wait->m_thread, rwlock->m_class); + aggregate_single_stat_chain(stat, wait_time); + } } wait->m_thread->m_wait_locker_count--; } @@ -1803,11 +1806,13 @@ static void end_cond_wait_v1(PSI_cond_lo PFS_single_stat_chain *stat; PFS_cond *cond= pfs_locker->m_target.m_cond; - ulonglong wait_time= wait->m_timer_end - wait->m_timer_start; - aggregate_single_stat_chain(&cond->m_wait_stat, wait_time); - stat= find_per_thread_cond_class_wait_stat(wait->m_thread, - cond->m_class); - aggregate_single_stat_chain(stat, wait_time); + if (wait->m_timer_state == TIMER_STATE_TIMED) + { + ulonglong wait_time= wait->m_timer_end - wait->m_timer_start; + aggregate_single_stat_chain(&cond->m_wait_stat, wait_time); + stat= find_per_thread_cond_class_wait_stat(wait->m_thread, cond->m_class); + aggregate_single_stat_chain(stat, wait_time); + } } wait->m_thread->m_wait_locker_count--; } @@ -1850,9 +1855,12 @@ static void end_table_wait_v1(PSI_table_ if (flag_events_waits_history_long) insert_events_waits_history_long(wait); - PFS_table *table= pfs_locker->m_target.m_table; - ulonglong wait_time= wait->m_timer_end - wait->m_timer_start; - aggregate_single_stat_chain(&table->m_wait_stat, wait_time); + if (wait->m_timer_state == TIMER_STATE_TIMED) + { + PFS_table *table= pfs_locker->m_target.m_table; + ulonglong wait_time= wait->m_timer_end - wait->m_timer_start; + aggregate_single_stat_chain(&table->m_wait_stat, wait_time); + } /* There is currently no per table and per thread aggregation. --===============6133041556503924703== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/chris.powers@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: chris.powers@stripped # target_branch: file:///home/cpowers/work/dev/dev-55-bugfixing/mysql/ # testament_sha1: 08e53f5a1f60d01011fa1f4d503e8c90e259291f # timestamp: 2010-08-20 09:30:46 -0500 # base_revision_id: holyfoot@stripped # # Begin bundle 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 8XhZWF28A7QfBT+LuSKcKEhAvygigA== --===============6133041556503924703==--