← Back to branch summary

~percona-core/percona-server/5.5

« back to all changes in this revision

Viewing changes to Percona-Server/storage/innobase/btr/btr0cur.c

  • Committer: Laurynas Biveinis
  • Date: 2013-09-06 13:24:59 UTC
  • mfrom: (558.8.3 5.5)
  • Revision ID: laurynas.biveinis@percona.com-20130906132459-jfaquw8dbwluzbsl
Merge lp:~akopytov/percona-server/ahi-fixes-5.5

Show diffs side-by-side

added added

removed removed

Lines of Context:
Percona-Server/storage/innobase/btr/btr0cur.c
520
520
#ifdef UNIV_SEARCH_PERF_STAT
521
521
        info->n_searches++;
522
522
#endif
523
 
        if (rw_lock_get_writer(btr_search_get_latch(cursor->index->id)) == RW_LOCK_NOT_LOCKED
 
523
        if (rw_lock_get_writer(btr_search_get_latch(cursor->index)) ==
 
524
            RW_LOCK_NOT_LOCKED
524
525
            && latch_mode <= BTR_MODIFY_LEAF
525
526
            && info->last_hash_succ
526
527
            && !estimate
556
557
 
557
558
        if (has_search_latch) {
558
559
                /* Release possible search latch to obey latching order */
559
 
                rw_lock_s_unlock(btr_search_get_latch(cursor->index->id));
 
560
                rw_lock_s_unlock(btr_search_get_latch(cursor->index));
560
561
        }
561
562
 
562
563
        /* Store the position of the tree latch we push to mtr so that we
871
872
 
872
873
        if (has_search_latch) {
873
874
 
874
 
                rw_lock_s_lock(btr_search_get_latch(cursor->index->id));
 
875
                rw_lock_s_lock(btr_search_get_latch(cursor->index));
875
876
        }
876
877
}
877
878
 
2056
2057
                        btr_search_update_hash_on_delete(cursor);
2057
2058
                }
2058
2059
 
2059
 
                rw_lock_x_lock(btr_search_get_latch(cursor->index->id));
 
2060
                rw_lock_x_lock(btr_search_get_latch(cursor->index));
2060
2061
        }
2061
2062
 
2062
2063
        row_upd_rec_in_place(rec, index, offsets, update, page_zip);
2063
2064
 
2064
2065
        if (is_hashed) {
2065
 
                rw_lock_x_unlock(btr_search_get_latch(cursor->index->id));
 
2066
                rw_lock_x_unlock(btr_search_get_latch(cursor->index));
2066
2067
        }
2067
2068
 
2068
2069
        if (page_zip && !dict_index_is_clust(index)