← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/page/page0zip.c

  • Committer: Stewart Smith
  • Date: 2010-11-03 03:28:23 UTC
  • mto: (1902.1.1 build) (1910.1.2 build)
  • mto: This revision was merged to the branch mainline in revision 1903.
  • Revision ID: stewart@flamingspork.com-20101103032823-44k21f0njmk97omr
fix docs warning: Title underline (and overline) is too short in brief_history_of_drizzle.rst

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/page/page0zip.c
1464
1464
                dict_table_t*   table = index->table;
1465
1465
                mem_heap_free(index->heap);
1466
1466
                mutex_free(&(table->autoinc_mutex));
1467
 
                ut_free(table->name);
1468
1467
                mem_heap_free(table->heap);
1469
1468
        }
1470
1469
}
3118
3117
        temp_page_zip in a debugger when running valgrind --db-attach. */
3119
3118
        VALGRIND_GET_VBITS(page, temp_page, UNIV_PAGE_SIZE);
3120
3119
        UNIV_MEM_ASSERT_RW(page, UNIV_PAGE_SIZE);
3121
 
# if UNIV_WORD_SIZE == 4
3122
3120
        VALGRIND_GET_VBITS(page_zip, &temp_page_zip, sizeof temp_page_zip);
3123
 
        /* On 32-bit systems, there is no padding in page_zip_des_t.
3124
 
        On other systems, Valgrind could complain about uninitialized
3125
 
        pad bytes. */
3126
3121
        UNIV_MEM_ASSERT_RW(page_zip, sizeof *page_zip);
3127
 
# endif
3128
3122
        VALGRIND_GET_VBITS(page_zip->data, temp_page,
3129
3123
                           page_zip_get_size(page_zip));
3130
3124
        UNIV_MEM_ASSERT_RW(page_zip->data, page_zip_get_size(page_zip));
4422
4416
        dict_index_t*   index,  /*!< in: index of the B-tree node */
4423
4417
        mtr_t*          mtr)    /*!< in: mini-transaction */
4424
4418
{
4425
 
        buf_pool_t*     buf_pool        = buf_pool_from_block(block);
4426
4419
        page_zip_des_t* page_zip        = buf_block_get_page_zip(block);
4427
4420
        page_t*         page            = buf_block_get_frame(block);
4428
4421
        buf_block_t*    temp_block;
4440
4433
        log_mode = mtr_set_log_mode(mtr, MTR_LOG_NONE);
4441
4434
 
4442
4435
#ifndef UNIV_HOTBACKUP
4443
 
        temp_block = buf_block_alloc(buf_pool, 0);
 
4436
        temp_block = buf_block_alloc(0);
4444
4437
        btr_search_drop_page_hash_index(block);
4445
4438
        block->check_index_page_at_flush = TRUE;
4446
4439
#else /* !UNIV_HOTBACKUP */
4468
4461
                /* Copy max trx id to recreated page */
4469
4462
                trx_id_t        max_trx_id = page_get_max_trx_id(temp_page);
4470
4463
                page_set_max_trx_id(block, NULL, max_trx_id, NULL);
4471
 
                ut_ad(max_trx_id != 0);
 
4464
                ut_ad(!ut_dulint_is_zero(max_trx_id));
4472
4465
        }
4473
4466
 
4474
4467
        /* Restore logging. */
4528
4521
        /* The PAGE_MAX_TRX_ID must be set on leaf pages of secondary
4529
4522
        indexes.  It does not matter on other pages. */
4530
4523
        ut_a(dict_index_is_clust(index) || !page_is_leaf(src)
4531
 
             || page_get_max_trx_id(src));
 
4524
             || !ut_dulint_is_zero(page_get_max_trx_id(src)));
4532
4525
 
4533
4526
        UNIV_MEM_ASSERT_W(page, UNIV_PAGE_SIZE);
4534
4527
        UNIV_MEM_ASSERT_W(page_zip->data, page_zip_get_size(page_zip));