~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/log/log0recv.cc

  • Committer: Monty Taylor
  • Date: 2010-12-26 23:42:28 UTC
  • mto: This revision was merged to the branch mainline in revision 2038.
  • Revision ID: mordred@inaugust.com-20101226234228-80mnll8m2jhsc3pu
Wow. Got rid of most of INNOBASE_SKIP_WARNINGS.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1589
1589
 
1590
1590
                if (recv->start_lsn >= page_lsn) {
1591
1591
 
1592
 
                        ib_uint64_t     end_lsn;
 
1592
                        ib_uint64_t     page_end_lsn;
1593
1593
 
1594
1594
                        if (!modification_to_page) {
1595
1595
 
1613
1613
                                                         buf + recv->len,
1614
1614
                                                         block, &mtr);
1615
1615
 
1616
 
                        end_lsn = recv->start_lsn + recv->len;
1617
 
                        mach_write_to_8(FIL_PAGE_LSN + page, end_lsn);
 
1616
                        page_end_lsn = recv->start_lsn + recv->len;
 
1617
                        mach_write_to_8(FIL_PAGE_LSN + page, page_end_lsn);
1618
1618
                        mach_write_to_8(UNIV_PAGE_SIZE
1619
1619
                                        - FIL_PAGE_END_LSN_OLD_CHKSUM
1620
 
                                        + page, end_lsn);
 
1620
                                        + page, page_end_lsn);
1621
1621
 
1622
1622
                        if (page_zip) {
1623
1623
                                mach_write_to_8(FIL_PAGE_LSN
1624
 
                                                + page_zip->data, end_lsn);
 
1624
                                                + page_zip->data, page_end_lsn);
1625
1625
                        }
1626
1626
                }
1627
1627