← Back to branch summary

~percona-core/percona-server/5.5

« back to all changes in this revision

Viewing changes to Percona-Server/storage/innobase/buf/buf0buf.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/buf/buf0buf.c
989
989
 
990
990
        block->check_index_page_at_flush = FALSE;
991
991
        block->index = NULL;
992
 
        block->btr_search_latch = NULL;
993
992
 
994
993
#ifdef UNIV_DEBUG
995
994
        block->page.in_page_hash = FALSE;
1468
1467
        ulint   j;
1469
1468
 
1470
1469
        for (j = 0; j < btr_search_index_num; j++) {
1471
 
                ut_ad(rw_lock_own(btr_search_latch_part[j], RW_LOCK_EX));
 
1470
                ut_ad(rw_lock_own(&btr_search_latch_arr[j], RW_LOCK_EX));
1472
1471
        }
1473
1472
#endif /* UNIV_SYNC_DEBUG */
1474
1473
        ut_ad(!btr_search_enabled);
2147
2146
{
2148
2147
        block->check_index_page_at_flush = FALSE;
2149
2148
        block->index            = NULL;
2150
 
        block->btr_search_latch = NULL;
2151
2149
 
2152
2150
        block->n_hash_helps     = 0;
2153
2151
        block->n_fields         = 1;