← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/drizzleimport.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/drizzleimport.cc
66
66
 
67
67
static struct my_option my_long_options[] =
68
68
{
69
 
  {"character-sets-dir", OPT_CHARSETS_DIR,
70
 
   "Directory where character sets are.", (char**) &charsets_dir,
71
 
   (char**) &charsets_dir, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
72
69
  {"default-character-set", OPT_DEFAULT_CHARSET,
73
70
   "Set the default character set.", (char**) &default_charset,
74
71
   (char**) &default_charset, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
274
271
    return(1);
275
272
  }
276
273
  if (strcmp(default_charset, charset_info->csname) &&
277
 
      !(charset_info= get_charset_by_csname(default_charset,
278
 
                MY_CS_PRIMARY, MYF(MY_WME))))
 
274
      !(charset_info= get_charset_by_csname(default_charset, MY_CS_PRIMARY)))
279
275
    exit(1);
280
276
  if (*argc < 2)
281
277
  {