← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/drizzle.cc

  • Committer: Monty Taylor
  • Date: 2009-02-09 20:45:49 UTC
  • mfrom: (864 drizzle)
  • mto: This revision was merged to the branch mainline in revision 865.
  • Revision ID: mordred@inaugust.com-20090209204549-hcaonir5zwelh0t9
Merged from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/drizzle.cc
201
201
static uint32_t select_limit;
202
202
static uint32_t max_join_size;
203
203
static uint32_t opt_connect_timeout= 0;
204
 
static char drizzle_charsets_dir[FN_REFLEN+1];
205
204
// TODO: Need to i18n these
206
205
static const char *day_names[]= {"Sun","Mon","Tue","Wed","Thu","Fri","Sat"};
207
206
static const char *month_names[]= {"Jan","Feb","Mar","Apr","May","Jun","Jul",
1309
1308
   (char**) &auto_vertical_output, (char**) &auto_vertical_output, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
1310
1309
  {"batch", 'B',
1311
1310
   N_("Don't use history file. Disable interactive behavior. (Enables --silent)"), 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
1312
 
  {"character-sets-dir", OPT_CHARSETS_DIR,
1313
 
   N_("Directory where character sets are."), (char**) &charsets_dir,
1314
 
   (char**) &charsets_dir, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
1315
1311
  {"column-type-info", OPT_COLUMN_TYPES, N_("Display column type information."),
1316
1312
   (char**) &column_types_flag, (char**) &column_types_flag,
1317
1313
   0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
1496
1492
  uint64_t temp_drizzle_port= 0;
1497
1493
 
1498
1494
  switch(optid) {
1499
 
  case OPT_CHARSETS_DIR:
1500
 
    strncpy(drizzle_charsets_dir, argument, sizeof(drizzle_charsets_dir) - 1);
1501
 
    charsets_dir = drizzle_charsets_dir;
1502
 
    break;
1503
1495
  case  OPT_DEFAULT_CHARSET:
1504
1496
    default_charset_used= 1;
1505
1497
    break;