← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/drizzleslap.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:
client/drizzleslap.cc
95
95
#include <iostream>
96
96
#include <fstream>
97
97
#include <drizzled/configmake.h>
 
98
#include <memory>
98
99
 
99
100
/* Added this for string translation. */
100
101
#include <drizzled/gettext.h>
103
104
#include <boost/thread/mutex.hpp>
104
105
#include <boost/thread/condition_variable.hpp>
105
106
#include <boost/program_options.hpp>
 
107
#include <boost/scoped_ptr.hpp>
106
108
#include <drizzled/atomics.h>
107
109
 
108
110
#define SLAP_NAME "drizzleslap"
270
272
  uint64_t counter= 0, queries;
271
273
  uint64_t detach_counter;
272
274
  uint32_t commit_counter;
273
 
  drizzle_con_st con;
 
275
  boost::scoped_ptr<drizzle_con_st> con_ap(new drizzle_con_st);
 
276
  drizzle_con_st &con= *con_ap.get();
274
277
  drizzle_result_st result;
275
278
  drizzle_row_t row;
276
279
  Statement *ptr;
558
561
    }
559
562
 
560
563
    uint64_t temp_drizzle_port= 0;
561
 
    drizzle_con_st con;
 
564
    boost::scoped_ptr<drizzle_con_st> con_ap(new drizzle_con_st);
 
565
    drizzle_con_st &con= *con_ap.get();
562
566
    OptionString *eptr;
563
567
 
564
568
    // Disable allow_guessing