← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/buf/buf0buddy.c

merge update-innobase-1.1.1 branch (incl fixes for trunk)

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/buf/buf0buddy.c
415
415
        buf_page_t*     bpage;
416
416
        const ulint     size    = BUF_BUDDY_LOW << i;
417
417
        ullint          usec    = ut_time_us(NULL);
 
418
        ulint           space;
 
419
        ulint           page_no;
418
420
 
419
421
        ut_ad(buf_pool_mutex_own(buf_pool));
420
422
        ut_ad(!mutex_own(&buf_pool->zip_mutex));
446
448
                pool), so there is nothing wrong about this.  The
447
449
                mach_read_from_4() calls here will only trigger bogus
448
450
                Valgrind memcheck warnings in UNIV_DEBUG_VALGRIND builds. */
449
 
                ulint           space   = mach_read_from_4(
 
451
                space   = mach_read_from_4(
450
452
                        (const byte*) src + FIL_PAGE_ARCH_LOG_NO_OR_SPACE_ID);
451
 
                ulint           page_no = mach_read_from_4(
 
453
                page_no = mach_read_from_4(
452
454
                        (const byte*) src + FIL_PAGE_OFFSET);
453
455
                /* Suppress Valgrind warnings about conditional jump
454
456
                on uninitialized value. */