← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/xtrabackup/xtrabackup.cc

  • Committer: Mark Atwood
  • Date: 2011-08-01 05:22:14 UTC
  • mfrom: (1919.3.53 drizzle_pbms)
  • Revision ID: me@mark.atwood.name-20110801052214-3wdsx3xgld6b5v4f
merge lp:~barry-leslie/drizzle/drizzle_pbms

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/xtrabackup/xtrabackup.cc
38
38
#include "ha_prototypes.h"
39
39
 //#define XTRABACKUP_TARGET_IS_PLUGIN
40
40
#include <boost/program_options.hpp>
41
 
#include <boost/scoped_array.hpp>
42
41
#include <boost/scoped_ptr.hpp>
43
42
 
44
43
typedef drizzled::charset_info_st CHARSET_INFO;
2787
2786
        log_group_t*    max_cp_group;
2788
2787
        ulint           max_cp_field;
2789
2788
        byte*           buf;
2790
 
        boost::scoped_array<byte>       log_hdr_buf_(
2791
 
                new byte[LOG_FILE_HDR_SIZE + OS_FILE_LOG_BLOCK_SIZE]);
 
2789
        byte            log_hdr_buf_[LOG_FILE_HDR_SIZE + OS_FILE_LOG_BLOCK_SIZE];
2792
2790
        byte*           log_hdr_buf;
2793
2791
        ulint           err;
2794
2792
 
2798
2796
        os_thread_id_t log_copying_thread_id;
2799
2797
        datafiles_iter_t *it;
2800
2798
 
2801
 
        log_hdr_buf = (byte*)ut_align(log_hdr_buf_.get(),
2802
 
                                      OS_FILE_LOG_BLOCK_SIZE);
 
2799
        log_hdr_buf = (unsigned char*)ut_align(log_hdr_buf_, OS_FILE_LOG_BLOCK_SIZE);
2803
2800
 
2804
2801
        /* log space */
2805
2802
        //space = UT_LIST_GET_NEXT(space_list, UT_LIST_GET_FIRST(f_system->space_list));
2885
2882
                                0, 0, LOG_FILE_HDR_SIZE);
2886
2883
        } else {
2887
2884
                /* Stream */
2888
 
                if ((write(fileno(stdout), log_hdr_buf, LOG_FILE_HDR_SIZE)
2889
 
                        - LOG_FILE_HDR_SIZE) == 0)
2890
 
                {
 
2885
                if (write(fileno(stdout), log_hdr_buf, LOG_FILE_HDR_SIZE)
 
2886
                                == LOG_FILE_HDR_SIZE) {
2891
2887
                        success = TRUE;
2892
2888
                } else {
2893
2889
                        success = FALSE;