← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to tests/resolve_stack_dump.cc

  • Committer: Jay Pipes
  • Date: 2010-04-08 16:27:25 UTC
  • mfrom: (1405.6.10 replication-pairs)
  • mto: This revision was merged to the branch mainline in revision 1457.
  • Revision ID: jpipes@serialcoder-20100408162725-sugbgn38oxjqclq2
Merge trunk and replication-pairs with conflict resolution

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/resolve_stack_dump.cc
25
25
#include "drizzled/charset_info.h"
26
26
#include "drizzled/internal/my_sys.h"
27
27
#include "drizzled/internal/m_string.h"
28
 
#include "drizzled/my_getopt.h"
 
28
#include "drizzled/option.h"
29
29
 
30
30
using namespace drizzled;
31
31
 
46
46
static DYNAMIC_ARRAY sym_table; /* how do you like this , static DYNAMIC ? */
47
47
static FILE* fp_dump, *fp_sym = 0, *fp_out;
48
48
 
49
 
static struct my_option my_long_options[] =
 
49
static struct option my_long_options[] =
50
50
{
51
51
  {"help", 'h', "Display this help and exit.",
52
52
   0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
98
98
}
99
99
 
100
100
 
101
 
static int get_one_option(int optid, const struct my_option *, char *)
 
101
static int get_one_option(int optid, const struct option *, char *)
102
102
{
103
103
  switch(optid) {
104
104
  case 'V':