diff options
| author | unknown <kevin.lewis@oracle.com> | 2011-10-04 10:10:14 -0500 |
|---|---|---|
| committer | unknown <kevin.lewis@oracle.com> | 2011-10-04 10:10:14 -0500 |
| commit | 8ea807c6bb808507a36f76545818b428111cffc5 (patch) | |
| tree | 686be82a9f36485631295905d6539c9acda91490 /storage/innobase/sync | |
| parent | 0122a138e4b8da24fc0f943fad9f610ad5b6f4d2 (diff) | |
| parent | c6d47e6e01e9f9dcb0ea1d7b3582136b65face32 (diff) | |
| download | mariadb-git-8ea807c6bb808507a36f76545818b428111cffc5.tar.gz | |
Merge from mysql-5.1 to mysql-5.5
Diffstat (limited to 'storage/innobase/sync')
| -rw-r--r-- | storage/innobase/sync/sync0rw.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/storage/innobase/sync/sync0rw.c b/storage/innobase/sync/sync0rw.c index 397d505df50..0f0df71316e 100644 --- a/storage/innobase/sync/sync0rw.c +++ b/storage/innobase/sync/sync0rw.c @@ -715,7 +715,7 @@ mutex. */ UNIV_INTERN void rw_lock_debug_mutex_enter(void) -/*==========================*/ +/*===========================*/ { loop: if (0 == mutex_enter_nowait(&rw_lock_debug_mutex)) { @@ -942,11 +942,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)); @@ -990,11 +992,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(); } } |