← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/archive/archive_reader.cc

  • Committer: Lee Bieber
  • Date: 2010-11-14 23:15:42 UTC
  • mfrom: (1929.1.42 warning-stack-frame)
  • Revision ID: kalebral@gmail.com-20101114231542-fnnu6ydd2p17n582
Merge Monty - fix bug 672372: some functions use > 32k stack

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/archive/archive_reader.cc
25
25
#include <drizzled/configmake.h>
26
26
using namespace std;
27
27
#include <boost/program_options.hpp>
 
28
#include <boost/scoped_ptr.hpp>
28
29
namespace po= boost::program_options;
29
30
#include "azio.h"
30
31
#include <string.h>
32
33
#include <stdio.h>
33
34
#include <stdarg.h>
34
35
#include <fcntl.h>
 
36
#include <memory>
35
37
#include "drizzled/charset_info.h"
36
38
#include "drizzled/internal/m_string.h"
37
39
 
85
87
  ;
86
88
 
87
89
  unsigned int ret;
88
 
  azio_stream reader_handle;
 
90
  boost::scoped_ptr<azio_stream> reader_handle_ap(new azio_stream);
 
91
  azio_stream &reader_handle= *reader_handle_ap.get();
89
92
 
90
93
  std::string system_config_dir_archive_reader(SYSCONFDIR); 
91
94
  system_config_dir_archive_reader.append("/drizzle/archive_reader.cnf");
163
166
 
164
167
  if (opt_autoincrement)
165
168
  {
166
 
    azio_stream writer_handle;
 
169
    boost::scoped_ptr<azio_stream> writer_handle_ap(new azio_stream);
 
170
    azio_stream &writer_handle= *writer_handle_ap.get();
167
171
 
168
172
    if (new_auto_increment_value)
169
173
    {
260
264
    uint64_t row_count= 0;
261
265
    char *buffer;
262
266
 
263
 
    azio_stream writer_handle;
 
267
    boost::scoped_ptr<azio_stream> writer_handle_ap(new azio_stream);
 
268
    azio_stream &writer_handle= *writer_handle_ap.get();
264
269
 
265
270
    buffer= (char *)malloc(reader_handle.longest_row);
266
271
    if (buffer == NULL)