← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/drizzleimport.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/drizzleimport.cc
67
67
static uint32_t opt_drizzle_port= 0;
68
68
static int64_t opt_ignore_lines= -1;
69
69
 
70
 
static struct my_option my_long_options[] =
 
70
static struct option my_long_options[] =
71
71
{
72
72
  {"columns", 'c',
73
73
   "Use only these columns to import the data to. Give the column names in a comma separated list. This is same as giving columns to LOAD DATA INFILE.",
170
170
  my_print_variables(my_long_options);
171
171
}
172
172
 
173
 
static int get_one_option(int optid, const struct my_option *, char *argument)
 
173
static int get_one_option(int optid, const struct option *, char *argument)
174
174
{
175
175
  char *endchar= NULL;
176
176
  uint64_t temp_drizzle_port= 0;