← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/myisam/myisamchk.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:
storage/myisam/myisamchk.cc
160
160
  {"backup", 'B',
161
161
   "Make a backup of the .MYD file as 'filename-time.BAK'.",
162
162
   0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
163
 
  {"character-sets-dir", OPT_CHARSETS_DIR,
164
 
   "Directory where character sets are.",
165
 
   (char**) &charsets_dir, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
166
163
  {"check", 'c',
167
164
   "Check table for errors.",
168
165
   0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
733
730
  check_param.key_cache_block_size= opt_key_cache_block_size;
734
731
 
735
732
  if (set_collation_name)
736
 
    if (!(set_collation= get_charset_by_name(set_collation_name,
737
 
                                             MYF(MY_WME))))
 
733
    if (!(set_collation= get_charset_by_name(set_collation_name)))
738
734
      exit(1);
739
735
 
740
736
  myisam_block_size=(uint) 1 << my_bit_log2(opt_myisam_block_size);