Commit 4d970bd5 authored by unknown's avatar unknown

myisamchk.c Make --set-character-set actually do something.


myisam/myisamchk.c:
  Make --set-character-set actually do something.
parent c015e128
...@@ -39,7 +39,6 @@ static uint decode_bits; ...@@ -39,7 +39,6 @@ static uint decode_bits;
static char **default_argv; static char **default_argv;
static const char *load_default_groups[]= { "myisamchk", 0 }; static const char *load_default_groups[]= { "myisamchk", 0 };
static const char *set_charset_name; static const char *set_charset_name;
static uint8 set_charset_number;
static CHARSET_INFO *set_charset; static CHARSET_INFO *set_charset;
static const char *type_names[]= static const char *type_names[]=
...@@ -607,9 +606,9 @@ static int myisamchk(MI_CHECK *param, my_string filename) ...@@ -607,9 +606,9 @@ static int myisamchk(MI_CHECK *param, my_string filename)
(((ulonglong) 1L << share->base.keys)-1)) || (((ulonglong) 1L << share->base.keys)-1)) ||
test_if_almost_full(info) || test_if_almost_full(info) ||
info->s->state.header.file_version[3] != myisam_file_magic[3] || info->s->state.header.file_version[3] != myisam_file_magic[3] ||
(set_charset && set_charset_number != share->state.header.language))) (set_charset && set_charset->number != share->state.header.language)))
{ {
check_param.language=set_charset_number; check_param.language=set_charset->number;
if (recreate_table(&check_param, &info,filename)) if (recreate_table(&check_param, &info,filename))
{ {
VOID(fprintf(stderr, VOID(fprintf(stderr,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment