← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

  • Committer: Brian Aker
  • Date: 2010-12-08 22:35:56 UTC
  • mfrom: (1819.9.158 update-innobase)
  • Revision ID: brian@tangent.org-20101208223556-37mi4omqg7lkjzf3
Merge in Stewart's changes, 1.3 changes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/btr/btr0btr.c
603
603
        ulint           line,   /*!< in: line where called */
604
604
        mtr_t*          mtr)    /*!< in: mtr */
605
605
{
606
 
        page_t*         page;
607
606
        dtuple_t*       tuple;
608
607
        rec_t*          user_rec;
609
608
        rec_t*          node_ptr;
621
620
 
622
621
        level = btr_page_get_level(btr_cur_get_page(cursor), mtr);
623
622
 
624
 
        page = btr_cur_get_page(cursor);
625
623
        user_rec = btr_cur_get_rec(cursor);
626
624
        ut_a(page_rec_is_user_rec(user_rec));
627
625
        tuple = dict_index_build_node_ptr(index, user_rec, 0, heap, level);
1899
1897
        buf_block_t*    left_block;
1900
1898
        buf_block_t*    right_block;
1901
1899
        buf_block_t*    insert_block;
1902
 
        page_t*         insert_page;
1903
1900
        page_cur_t*     page_cursor;
1904
1901
        rec_t*          first_rec;
1905
1902
        byte*           buf = 0; /* remove warning */
2155
2152
                insert_block = right_block;
2156
2153
        }
2157
2154
 
2158
 
        insert_page = buf_block_get_frame(insert_block);
2159
 
 
2160
2155
        /* 7. Reposition the cursor for insert and try insertion */
2161
2156
        page_cursor = btr_cur_get_page_cur(cursor);
2162
2157
 
2168
2163
 
2169
2164
#ifdef UNIV_ZIP_DEBUG
2170
2165
        {
 
2166
                page_t*         insert_page
 
2167
                        = buf_block_get_frame(insert_block);
 
2168
 
2171
2169
                page_zip_des_t* insert_page_zip
2172
2170
                        = buf_block_get_page_zip(insert_block);
 
2171
 
2173
2172
                ut_a(!insert_page_zip
2174
2173
                     || page_zip_validate(insert_page_zip, insert_page));
2175
2174
        }
2562
2561
        ulint           n_recs;
2563
2562
        ulint           max_ins_size;
2564
2563
        ulint           max_ins_size_reorg;
2565
 
        ulint           level;
2566
2564
 
2567
2565
        block = btr_cur_get_block(cursor);
2568
2566
        page = btr_cur_get_page(cursor);
2572
2570
        ut_ad(mtr_memo_contains(mtr, dict_index_get_lock(index),
2573
2571
                                MTR_MEMO_X_LOCK));
2574
2572
        ut_ad(mtr_memo_contains(mtr, block, MTR_MEMO_PAGE_X_FIX));
2575
 
        level = btr_page_get_level(page, mtr);
2576
2573
        space = dict_index_get_space(index);
2577
2574
        zip_size = dict_table_zip_size(index->table);
2578
2575