← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/fsp/fsp0fsp.c

Merge initial InnoDB+ import.

This was applied by generating a patch between MySQL 5.1.50 InnoDB plugin and
the just-merged innodb+ from mysql-trunk revision-id: vasil.dimov@oracle.com-20100422110752-1zowoqxel5xx3z2e

Then, some manual merge resolving and it worked. This should make it much
easier to merge the rest of InnoDB 1.1 and 1.2 from the mysql tree using
my bzr-reapply script.

This takes us to InnoDB 1.1.1(ish).

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/fsp/fsp0fsp.c
869
869
                return;
870
870
        }
871
871
 
872
 
        memset(page, 0, UNIV_PAGE_SIZE);
 
872
        UNIV_MEM_INVALID(page, UNIV_PAGE_SIZE);
873
873
        mach_write_to_4(page + FIL_PAGE_OFFSET, buf_block_get_page_no(block));
 
874
        memset(page + FIL_PAGE_LSN, 0, 8);
874
875
        mach_write_to_4(page + FIL_PAGE_ARCH_LOG_NO_OR_SPACE_ID,
875
876
                        buf_block_get_space(block));
 
877
        memset(page + UNIV_PAGE_SIZE - FIL_PAGE_END_LSN_OLD_CHKSUM, 0, 8);
876
878
}
877
879
 
878
880
#ifndef UNIV_HOTBACKUP