← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/srv/srv0start.cc

  • Committer: Lee Bieber
  • Date: 2011-03-31 14:40:56 UTC
  • mfrom: (2242.1.133 drizzle-xtrabackup)
  • Revision ID: kalebral@gmail.com-20110331144056-hdhp6cj0zo1keuc9
Merge Stewart - xtrabackup port to drizzle

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/srv/srv0start.cc
88
88
# include "thr0loc.h"
89
89
# include "os0sync.h" /* for INNODB_RW_LOCKS_USE_ATOMICS */
90
90
# include "zlib.h" /* for ZLIB_VERSION */
 
91
#include "xtrabackup_api.h"
91
92
 
92
93
#include <errno.h>
93
94
#include <unistd.h>
555
556
/*********************************************************************//**
556
557
Creates or opens the log files and closes them.
557
558
@return DB_SUCCESS or error code */
558
 
static
559
559
ulint
560
560
open_or_create_log_file(
561
561
/*====================*/
708
708
/*********************************************************************//**
709
709
Creates or opens database data files and closes them.
710
710
@return DB_SUCCESS or error code */
711
 
static
712
711
ulint
713
712
open_or_create_data_files(
714
713
/*======================*/
1558
1557
                are initialized in trx_sys_init_at_db_start(). */
1559
1558
 
1560
1559
                recv_recovery_from_checkpoint_finish();
 
1560
 
 
1561
                if (srv_apply_log_only)
 
1562
                  goto skip_processes;
 
1563
 
1561
1564
                if (srv_force_recovery < SRV_FORCE_NO_IBUF_MERGE) {
1562
1565
                        /* The following call is necessary for the insert
1563
1566
                        buffer to work with multiple tablespaces. We must
1824
1827
                ibuf_update_max_tablespace_id();
1825
1828
        }
1826
1829
 
 
1830
skip_processes:
1827
1831
        srv_file_per_table = srv_file_per_table_original_value;
1828
1832
 
1829
1833
        srv_was_started = TRUE;