← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/drizzle.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/drizzle.cc
1418
1418
}
1419
1419
#endif
1420
1420
 
1421
 
static struct my_option my_long_options[] =
 
1421
static struct option my_long_options[] =
1422
1422
{
1423
1423
  {"help", '?', N_("Display this help and exit."), 0, 0, 0, GET_NO_ARG, NO_ARG, 0,
1424
1424
    0, 0, 0, 0, 0},
1606
1606
}
1607
1607
 
1608
1608
 
1609
 
static int get_one_option(int optid, const struct my_option *, char *argument)
 
1609
static int get_one_option(int optid, const struct option *, char *argument)
1610
1610
{
1611
1611
  char *endchar= NULL;
1612
1612
  uint64_t temp_drizzle_port= 0;