← Back to branch summary

~ubuntu-branches/ubuntu/maverick/mysql-5.1/maverick-proposed

« back to all changes in this revision

Viewing changes to storage/innobase/btr/btr0btr.c

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2012-02-22 14:16:05 UTC
  • mto: This revision was merged to the branch mainline in revision 20.
  • Revision ID: package-import@ubuntu.com-20120222141605-nxlu9yzc6attylc2
Tags: upstream-5.1.61
Import upstream version 5.1.61

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/innobase/btr/btr0btr.c
464
464
        page_no = buf_frame_get_page_no(page);
465
465
 
466
466
        fseg_free_page(seg_header, space, page_no, mtr);
 
467
 
 
468
        /* The page was marked free in the allocation bitmap, but it
 
469
        should remain buffer-fixed until mtr_commit(mtr) or until it
 
470
        is explicitly freed from the mini-transaction. */
 
471
        ut_ad(mtr_memo_contains(mtr, buf_block_align(page),
 
472
                                MTR_MEMO_PAGE_X_FIX));
 
473
        /* TODO: Discard any operations on the page from the redo log
 
474
        and remove the block from the flush list and the buffer pool.
 
475
        This would free up buffer pool earlier and reduce writes to
 
476
        both the tablespace and the redo log. */
467
477
}
468
478
 
469
479
/******************************************************************
479
489
{
480
490
        ulint           level;
481
491
 
 
492
        ut_ad(fil_page_get_type(page) == FIL_PAGE_INDEX);
482
493
        ut_ad(mtr_memo_contains(mtr, buf_block_align(page),
483
494
                                MTR_MEMO_PAGE_X_FIX));
484
495
        level = btr_page_get_level(page, mtr);
610
621
                      "InnoDB: corruption. If the crash happens at "
611
622
                      "the database startup, see\n"
612
623
                      "InnoDB: http://dev.mysql.com/doc/refman/5.1/en/"
613
 
                      "forcing-recovery.html about\n"
 
624
                      "forcing-innodb-recovery.html about\n"
614
625
                      "InnoDB: forcing recovery. "
615
626
                      "Then dump + drop + reimport.\n", stderr);
616
627
        }
2060
2071
        ulint           n_recs;
2061
2072
        ulint           max_ins_size;
2062
2073
        ulint           max_ins_size_reorg;
2063
 
        ulint           level;
2064
2074
        ulint           comp;
2065
2075
 
2066
2076
        page = btr_cur_get_page(cursor);
2072
2082
                                MTR_MEMO_X_LOCK));
2073
2083
        ut_ad(mtr_memo_contains(mtr, buf_block_align(page),
2074
2084
                                MTR_MEMO_PAGE_X_FIX));
2075
 
        level = btr_page_get_level(page, mtr);
2076
2085
        space = dict_index_get_space(index);
2077
2086
 
2078
2087
        left_page_no = btr_page_get_prev(page, mtr);