← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/drizzledump.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/drizzledump.cc
181
181
   "Adds 'STOP SLAVE' prior to 'CHANGE MASTER' and 'START SLAVE' to bottom of dump.",
182
182
   (char**) &opt_slave_apply, (char**) &opt_slave_apply, 0, GET_BOOL, NO_ARG,
183
183
   0, 0, 0, 0, 0, 0},
184
 
  {"character-sets-dir", OPT_CHARSETS_DIR,
185
 
   "Directory where character sets are.", (char**) &charsets_dir,
186
 
   (char**) &charsets_dir, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
187
184
  {"comments", 'i', "Write additional information.",
188
185
   (char**) &opt_comments, (char**) &opt_comments, 0, GET_BOOL, NO_ARG,
189
186
   1, 0, 0, 0, 0, 0},
845
842
    return(EX_USAGE);
846
843
  }
847
844
  if (strcmp(default_charset, charset_info->csname) &&
848
 
      !(charset_info= get_charset_by_csname(default_charset,
849
 
                                            MY_CS_PRIMARY, MYF(MY_WME))))
 
845
      !(charset_info= get_charset_by_csname(default_charset, MY_CS_PRIMARY)))
850
846
    exit(1);
851
847
  if ((*argc < 1 && !opt_alldbs) || (*argc > 0 && opt_alldbs))
852
848
  {