← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/drizzleslap.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:
client/drizzleslap.cc
528
528
}
529
529
 
530
530
 
531
 
static struct my_option my_long_options[] =
 
531
static struct option my_long_options[] =
532
532
{
533
533
  {"help", '?', "Display this help and exit.", 0, 0, 0, GET_NO_ARG, NO_ARG,
534
534
   0, 0, 0, 0, 0, 0},
727
727
  my_print_help(my_long_options);
728
728
}
729
729
 
730
 
static int get_one_option(int optid, const struct my_option *, char *argument)
 
730
static int get_one_option(int optid, const struct option *, char *argument)
731
731
{
732
732
  char *endchar= NULL;
733
733
  uint64_t temp_drizzle_port= 0;