← Back to branch summary

~ubuntu-branches/ubuntu/trusty/drizzle/trusty

« back to all changes in this revision

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

  • Committer: Bazaar Package Importer
  • Author(s): Monty Taylor
  • Date: 2010-12-21 16:39:40 UTC
  • mfrom: (1.2.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20101221163940-c1pfo1jjvx7909xq
Tags: 2010.12.06-0ubuntu1
* New upstream release.
* Added libaio-dev build depend for InnoDB.
* Removed libpcre patch - applied upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/log/log0recv.c
1
1
/*****************************************************************************
2
2
 
3
 
Copyright (c) 1997, 2010, Innobase Oy. All Rights Reserved.
 
3
Copyright (C) 1997, 2010, Innobase Oy. All Rights Reserved.
4
4
 
5
5
This program is free software; you can redistribute it and/or modify it under
6
6
the terms of the GNU General Public License as published by the Free Software
569
569
        ib_uint64_t     start_lsn;
570
570
        ib_uint64_t     end_lsn;
571
571
        ib_uint64_t     recovered_lsn;
572
 
        ib_uint64_t     limit_lsn;
573
572
 
574
573
        recovered_lsn = recv_sys->recovered_lsn;
575
 
        limit_lsn = recv_sys->limit_lsn;
576
574
 
577
575
        /* Read the last recovered log block to the recovery system buffer:
578
576
        the block is always incomplete */
1659
1657
 
1660
1658
#ifndef UNIV_HOTBACKUP
1661
1659
        if (modification_to_page) {
1662
 
                buf_pool_t*     buf_pool;
1663
 
 
1664
1660
                ut_a(block);
1665
1661
 
1666
 
                buf_pool = buf_pool_from_block(block);
1667
 
 
1668
1662
                log_flush_order_mutex_enter();
1669
1663
                buf_flush_recv_note_modification(block, start_lsn, end_lsn);
1670
1664
                log_flush_order_mutex_exit();
2908
2902
        ib_uint64_t     old_scanned_lsn;
2909
2903
        ib_uint64_t     group_scanned_lsn= 0;
2910
2904
        ib_uint64_t     contiguous_lsn;
 
2905
#ifdef UNIV_LOG_ARCHIVE
2911
2906
        ib_uint64_t     archived_lsn;
 
2907
#endif /* UNIV_LOG_ARCHIVE */
2912
2908
        byte*           buf;
2913
2909
        byte            log_hdr_buf[LOG_FILE_HDR_SIZE];
2914
2910
        ulint           err;
2963
2959
 
2964
2960
        checkpoint_lsn = mach_read_from_8(buf + LOG_CHECKPOINT_LSN);
2965
2961
        checkpoint_no = mach_read_from_8(buf + LOG_CHECKPOINT_NO);
 
2962
#ifdef UNIV_LOG_ARCHIVE
2966
2963
        archived_lsn = mach_read_from_8(buf + LOG_CHECKPOINT_ARCHIVED_LSN);
 
2964
#endif /* UNIV_LOG_ARCHIVE */
2967
2965
 
2968
2966
        /* Read the first log file header to print a note if this is
2969
2967
        a recovery from a restored InnoDB Hot Backup */