diff options
| author | Marko Mäkelä <marko.makela@oracle.com> | 2011-11-22 13:14:55 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@oracle.com> | 2011-11-22 13:14:55 +0200 |
| commit | 7a48b3df7f64bc2eb077f7f2f1bda6829ed7b2a8 (patch) | |
| tree | 2bf021534c880b693ae195c21b3d5fc1e1e52fe9 /storage/innobase/btr/btr0cur.c | |
| parent | 7ee2962f192e21c0e30cf030e719e1396f7be1ad (diff) | |
| download | mariadb-git-7a48b3df7f64bc2eb077f7f2f1bda6829ed7b2a8.tar.gz | |
Bug#13340047 LATCHING ORDER VIOLATION IN IBUF_SET_ENTRY_COUNTER() - cleanup
Remove btr_cur_t::ibuf_cnt. The only dependence on cursor->ibuf_cnt
was ibuf_set_entry_counter(). That code path was removed in the
original bug fix (marko.makela@oracle.com-20111107072802-dgwagejlpub0rjkd).
rb:819 approved by Jimmy Yang
Diffstat (limited to 'storage/innobase/btr/btr0cur.c')
| -rw-r--r-- | storage/innobase/btr/btr0cur.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/storage/innobase/btr/btr0cur.c b/storage/innobase/btr/btr0cur.c index 625721133fd..03346337d3f 100644 --- a/storage/innobase/btr/btr0cur.c +++ b/storage/innobase/btr/btr0cur.c @@ -458,8 +458,6 @@ btr_cur_search_to_nth_level( cursor->flag = BTR_CUR_BINARY; cursor->index = index; - cursor->ibuf_cnt = ULINT_UNDEFINED; - #ifndef BTR_CUR_ADAPT guess = NULL; #else @@ -747,21 +745,8 @@ retry_page_get: /* We're doing a search on an ibuf tree and we're one level above the leaf page. */ - ulint is_min_rec; - ut_ad(level == 0); - is_min_rec = rec_get_info_bits(node_ptr, 0) - & REC_INFO_MIN_REC_FLAG; - - if (!is_min_rec) { - cursor->ibuf_cnt - = ibuf_rec_get_counter(node_ptr); - - ut_a(cursor->ibuf_cnt <= 0xFFFF - || cursor->ibuf_cnt == ULINT_UNDEFINED); - } - buf_mode = BUF_GET; rw_latch = RW_NO_LATCH; goto retry_page_get; |