diff options
| author | Mikael Ronstrom <mikael@mysql.com> | 2008-10-15 20:54:18 +0200 |
|---|---|---|
| committer | Mikael Ronstrom <mikael@mysql.com> | 2008-10-15 20:54:18 +0200 |
| commit | 2c252ba96b8f124f81371ec86843a45dc3977d54 (patch) | |
| tree | 0e544d3d36c291cd92de5c60cecaeaba75e39f4c /storage/innobase/btr | |
| parent | 772cdf0000b3eb99ce3c91ad8b1a8765d7bf5b74 (diff) | |
| download | mariadb-git-2c252ba96b8f124f81371ec86843a45dc3977d54.tar.gz | |
Google SMP patch
Diffstat (limited to 'storage/innobase/btr')
| -rw-r--r-- | storage/innobase/btr/btr0cur.c | 2 | ||||
| -rw-r--r-- | storage/innobase/btr/btr0sea.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/storage/innobase/btr/btr0cur.c b/storage/innobase/btr/btr0cur.c index 54acdf73db6..a2f62255dd6 100644 --- a/storage/innobase/btr/btr0cur.c +++ b/storage/innobase/btr/btr0cur.c @@ -333,7 +333,7 @@ btr_cur_search_to_nth_level( #ifdef UNIV_SEARCH_PERF_STAT info->n_searches++; #endif - if (btr_search_latch.writer == RW_LOCK_NOT_LOCKED + if (rw_lock_get_writer(&btr_search_latch) == RW_LOCK_NOT_LOCKED && latch_mode <= BTR_MODIFY_LEAF && info->last_hash_succ && !estimate #ifdef PAGE_CUR_LE_OR_EXTENDS diff --git a/storage/innobase/btr/btr0sea.c b/storage/innobase/btr/btr0sea.c index 2fe3606a390..b0ce5db6ccd 100644 --- a/storage/innobase/btr/btr0sea.c +++ b/storage/innobase/btr/btr0sea.c @@ -748,8 +748,8 @@ btr_search_guess_on_hash( rw_lock_s_lock(&btr_search_latch); } - ut_ad(btr_search_latch.writer != RW_LOCK_EX); - ut_ad(btr_search_latch.reader_count > 0); + ut_ad(rw_lock_get_writer(&btr_search_latch) != RW_LOCK_EX); + ut_ad(rw_lock_get_reader_count(&btr_search_latch) > 0); rec = ha_search_and_get_data(btr_search_sys->hash_index, fold); |