From: kevin.lewis Date: October 4 2011 3:42pm Subject: bzr push into mysql-trunk branch (kevin.lewis:3475) List-Archive: http://lists.mysql.com/commits/141380 Message-Id: <20111004154243.C3D6A18B735B@dhcp-adc-twvpn-2-vpnpool-10-154-59-203.vpn.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3475 kevin.lewis@stripped 2011-10-04 [merge] Merge with current mysql-trunk removed: mysql-test/r/join_cache_bka_nobnl.result mysql-test/r/join_nested_bka_nobnl.result mysql-test/r/join_outer_bka_nobnl.result mysql-test/r/select_all_bka_nobnl.result mysql-test/r/select_icp_mrr_bka_nobnl.result mysql-test/r/select_none_bka_nobnl.result mysql-test/r/subquery_all_bka_nobnl.result mysql-test/r/subquery_nomat_nosj_bka_nobnl.result mysql-test/r/subquery_none_bka_nobnl.result mysql-test/r/subquery_sj_all_bka_nobnl.result mysql-test/r/subquery_sj_dupsweed_bka_nobnl.result mysql-test/r/subquery_sj_firstmatch_bka_nobnl.result mysql-test/r/subquery_sj_innodb_all_bka_nobnl.result mysql-test/r/subquery_sj_innodb_none_bka_nobnl.result mysql-test/r/subquery_sj_loosescan_bka_nobnl.result mysql-test/r/subquery_sj_mat_bka_nobnl.result mysql-test/r/subquery_sj_none_bka_nobnl.result mysql-test/t/join_cache_bka_nobnl.test mysql-test/t/join_nested_bka_nobnl.test mysql-test/t/join_outer_bka_nobnl.test mysql-test/t/select_all_bka_nobnl.test mysql-test/t/select_icp_mrr_bka_nobnl.test mysql-test/t/select_none_bka_nobnl.test mysql-test/t/subquery_all_bka_nobnl.test mysql-test/t/subquery_nomat_nosj_bka_nobnl.test mysql-test/t/subquery_none_bka_nobnl.test mysql-test/t/subquery_sj_all_bka_nobnl.test mysql-test/t/subquery_sj_dupsweed_bka_nobnl.test mysql-test/t/subquery_sj_firstmatch_bka_nobnl.test mysql-test/t/subquery_sj_innodb_all_bka_nobnl.test mysql-test/t/subquery_sj_innodb_none_bka_nobnl.test mysql-test/t/subquery_sj_loosescan_bka_nobnl.test mysql-test/t/subquery_sj_mat_bka_nobnl.test mysql-test/t/subquery_sj_none_bka_nobnl.test added: mysql-test/r/join_cache_bka_nixbnl.result mysql-test/r/join_nested_bka_nixbnl.result mysql-test/r/join_outer_bka_nixbnl.result mysql-test/r/select_all_bka_nixbnl.result mysql-test/r/select_icp_mrr_bka_nixbnl.result mysql-test/r/select_none_bka_nixbnl.result mysql-test/r/subquery_all_bka_nixbnl.result mysql-test/r/subquery_nomat_nosj_bka_nixbnl.result mysql-test/r/subquery_none_bka_nixbnl.result mysql-test/r/subquery_sj_all_bka_nixbnl.result mysql-test/r/subquery_sj_dupsweed_bka_nixbnl.result mysql-test/r/subquery_sj_firstmatch_bka_nixbnl.result mysql-test/r/subquery_sj_innodb_all_bka_nixbnl.result mysql-test/r/subquery_sj_innodb_none_bka_nixbnl.result mysql-test/r/subquery_sj_loosescan_bka_nixbnl.result mysql-test/r/subquery_sj_mat_bka_nixbnl.result mysql-test/r/subquery_sj_none_bka_nixbnl.result mysql-test/t/join_cache_bka_nixbnl.test mysql-test/t/join_nested_bka_nixbnl.test mysql-test/t/join_outer_bka_nixbnl.test mysql-test/t/select_all_bka_nixbnl.test mysql-test/t/select_icp_mrr_bka_nixbnl.test mysql-test/t/select_none_bka_nixbnl.test mysql-test/t/subquery_all_bka_nixbnl.test mysql-test/t/subquery_nomat_nosj_bka_nixbnl.test mysql-test/t/subquery_none_bka_nixbnl.test mysql-test/t/subquery_sj_all_bka_nixbnl.test mysql-test/t/subquery_sj_dupsweed_bka_nixbnl.test mysql-test/t/subquery_sj_firstmatch_bka_nixbnl.test mysql-test/t/subquery_sj_innodb_all_bka_nixbnl.test mysql-test/t/subquery_sj_innodb_none_bka_nixbnl.test mysql-test/t/subquery_sj_loosescan_bka_nixbnl.test mysql-test/t/subquery_sj_mat_bka_nixbnl.test mysql-test/t/subquery_sj_none_bka_nixbnl.test modified: mysql-test/collections/default.experimental mysql-test/include/subquery_sj.inc mysql-test/r/subquery_sj_all.result mysql-test/r/subquery_sj_all_bka.result mysql-test/r/subquery_sj_all_bkaunique.result mysql-test/r/subquery_sj_dupsweed.result mysql-test/r/subquery_sj_dupsweed_bka.result mysql-test/r/subquery_sj_dupsweed_bkaunique.result mysql-test/r/subquery_sj_firstmatch.result mysql-test/r/subquery_sj_firstmatch_bka.result mysql-test/r/subquery_sj_firstmatch_bkaunique.result mysql-test/r/subquery_sj_loosescan.result mysql-test/r/subquery_sj_loosescan_bka.result mysql-test/r/subquery_sj_loosescan_bkaunique.result mysql-test/r/subquery_sj_mat.result mysql-test/r/subquery_sj_mat_bka.result mysql-test/r/subquery_sj_mat_bkaunique.result mysql-test/r/subquery_sj_mat_nosj.result mysql-test/r/subquery_sj_none.result mysql-test/r/subquery_sj_none_bka.result mysql-test/r/subquery_sj_none_bkaunique.result mysql-test/suite/opt_trace/r/general_no_prot_all.result mysql-test/suite/opt_trace/r/general_ps_prot_all.result sql/sql_select.cc sql/sql_select.h support-files/mysql.spec.sh === modified file 'storage/innobase/include/sync0rw.h' --- a/storage/innobase/include/sync0rw.h revid:joerg.bruehe@stripped +++ b/storage/innobase/include/sync0rw.h revid:kevin.lewis@stripped @@ -544,7 +544,7 @@ mutex. */ UNIV_INTERN void rw_lock_debug_mutex_enter(void); -/*==========================*/ +/*===========================*/ /******************************************************************//** Releases the debug mutex. */ UNIV_INTERN @@ -634,7 +634,8 @@ struct rw_lock_struct { }; #ifdef UNIV_SYNC_DEBUG -/** The structure for storing debug info of an rw-lock */ +/** The structure for storing debug info of an rw-lock. All access to this +structure must be protected by rw_lock_debug_mutex_enter(). */ struct rw_lock_debug_struct { os_thread_id_t thread_id; /*!< The thread id of the thread which === modified file 'storage/innobase/sync/sync0rw.c' --- a/storage/innobase/sync/sync0rw.c revid:joerg.bruehe@stripped +++ b/storage/innobase/sync/sync0rw.c revid:kevin.lewis@stripped @@ -719,7 +719,7 @@ mutex. */ UNIV_INTERN void rw_lock_debug_mutex_enter(void) -/*==========================*/ +/*===========================*/ { loop: if (0 == mutex_enter_nowait(&rw_lock_debug_mutex)) { @@ -948,11 +948,13 @@ rw_lock_list_print_info( putc('\n', file); } + rw_lock_debug_mutex_enter(); info = UT_LIST_GET_FIRST(lock->debug_list); while (info != NULL) { rw_lock_debug_print(file, info); info = UT_LIST_GET_NEXT(list, info); } + rw_lock_debug_mutex_exit(); } #ifndef INNODB_RW_LOCKS_USE_ATOMICS mutex_exit(&(lock->mutex)); @@ -996,11 +998,13 @@ rw_lock_print( putc('\n', stderr); } + rw_lock_debug_mutex_enter(); info = UT_LIST_GET_FIRST(lock->debug_list); while (info != NULL) { rw_lock_debug_print(stderr, info); info = UT_LIST_GET_NEXT(list, info); } + rw_lock_debug_mutex_exit(); } } No bundle (reason: useless for push emails).