← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/trx/trx0trx.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/trx/trx0trx.c
1793
1793
/*===================*/
1794
1794
        trx_t*  trx)    /*!< in: transaction */
1795
1795
{
1796
 
        page_t*         update_hdr_page;
1797
1796
        trx_rseg_t*     rseg;
1798
1797
        ib_uint64_t     lsn             = 0;
1799
1798
        mtr_t           mtr;
1826
1825
                }
1827
1826
 
1828
1827
                if (trx->update_undo) {
1829
 
                        update_hdr_page = trx_undo_set_state_at_prepare(
 
1828
                        trx_undo_set_state_at_prepare(
1830
1829
                                trx, trx->update_undo, &mtr);
1831
1830
                }
1832
1831