← Back to branch summary

~maria-captains/maria/xtradb-mergetree-5.5

« back to all changes in this revision

Viewing changes to btr/btr0btr.c

  • Committer: knielsen at knielsen-hq
  • Date: 2012-02-15 10:49:53 UTC
  • Revision ID: knielsen@knielsen-hq.org-20120215104953-wzcl57vil72bbmp1
Updated with XtraDB from Percona Server 5.5.20-24.1
Files copied from Percona-Server-5.5.20-rel24.1.tar.gz source tarball.

Show diffs side-by-side

added added

removed removed

Lines of Context:
btr/btr0btr.c
1523
1523
        }
1524
1524
        ut_a(block);
1525
1525
 
1526
 
        btr_search_drop_page_hash_index(block, NULL);
 
1526
        btr_search_drop_page_hash_index(block);
1527
1527
 
1528
1528
        header = buf_block_get_frame(block) + PAGE_HEADER + PAGE_BTR_SEG_TOP;
1529
1529
#ifdef UNIV_BTR_DEBUG
1592
1592
 
1593
1593
#ifndef UNIV_HOTBACKUP
1594
1594
        if (UNIV_LIKELY(!recovery)) {
1595
 
                btr_search_drop_page_hash_index(block, index);
 
1595
                btr_search_drop_page_hash_index(block);
1596
1596
        }
1597
1597
 
1598
1598
        block->check_index_page_at_flush = TRUE;
1760
1760
        ut_a(!page_zip || page_zip_validate(page_zip, page));
1761
1761
#endif /* UNIV_ZIP_DEBUG */
1762
1762
 
1763
 
        btr_search_drop_page_hash_index(block, index);
 
1763
        btr_search_drop_page_hash_index(block);
1764
1764
        btr_blob_dbg_remove(page, index, "btr_page_empty");
1765
1765
 
1766
1766
        /* Recreate the page: note that global data on page (possible
3093
3093
                mem_heap_free(heap);
3094
3094
        }
3095
3095
 
3096
 
        btr_search_drop_page_hash_index(block, index);
 
3096
        btr_search_drop_page_hash_index(block);
3097
3097
 
3098
3098
        /* Make the father empty */
3099
3099
        btr_page_empty(father_block, father_page_zip, index, page_level, mtr);
3317
3317
                        goto err_exit;
3318
3318
                }
3319
3319
 
3320
 
                btr_search_drop_page_hash_index(block, index);
 
3320
                btr_search_drop_page_hash_index(block);
3321
3321
 
3322
3322
                /* Remove the page from the level list */
3323
3323
                btr_level_list_remove(space, zip_size, page, index, mtr);
3358
3358
                        goto err_exit;
3359
3359
                }
3360
3360
 
3361
 
                btr_search_drop_page_hash_index(block, index);
 
3361
                btr_search_drop_page_hash_index(block);
3362
3362
 
3363
3363
#ifdef UNIV_BTR_DEBUG
3364
3364
                if (UNIV_LIKELY_NULL(merge_page_zip)) {
3473
3473
                ut_a(btr_page_get_next(page, mtr) == FIL_NULL);
3474
3474
 
3475
3475
                ut_ad(mtr_memo_contains(mtr, block, MTR_MEMO_PAGE_X_FIX));
3476
 
                btr_search_drop_page_hash_index(block, index);
 
3476
                btr_search_drop_page_hash_index(block);
3477
3477
 
3478
3478
                btr_page_get_father(index, block, mtr, &cursor);
3479
3479
                father = btr_cur_get_block(&cursor);
3578
3578
 
3579
3579
        page = buf_block_get_frame(block);
3580
3580
        ut_a(page_is_comp(merge_page) == page_is_comp(page));
3581
 
        btr_search_drop_page_hash_index(block, index);
 
3581
        btr_search_drop_page_hash_index(block);
3582
3582
 
3583
3583
        if (left_page_no == FIL_NULL && !page_is_leaf(page)) {
3584
3584