diff options
| author | unknown <tim@white.box> | 2001-08-21 19:24:35 -0400 |
|---|---|---|
| committer | unknown <tim@white.box> | 2001-08-21 19:24:35 -0400 |
| commit | 269e914b3d59bf45f7d887c3be1d34004d85191d (patch) | |
| tree | f63e37772831e7183bdf7008ecb9e7c0ef3081e6 /myisam | |
| parent | d85006f2549dd708e356a645192bbdd838aee5fb (diff) | |
| parent | 65bc433d812251e87920198b9c3ab981b142cc80 (diff) | |
| download | mariadb-git-269e914b3d59bf45f7d887c3be1d34004d85191d.tar.gz | |
Merge
client/mysqlbinlog.cc:
SCCS merged
client/mysqltest.c:
SCCS merged
include/my_pthread.h:
SCCS merged
Diffstat (limited to 'myisam')
| -rw-r--r-- | myisam/myisamchk.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/myisam/myisamchk.c b/myisam/myisamchk.c index 996e4749e53..8ee92debf56 100644 --- a/myisam/myisamchk.c +++ b/myisam/myisamchk.c @@ -39,7 +39,6 @@ static uint decode_bits; static char **default_argv; static const char *load_default_groups[]= { "myisamchk", 0 }; static const char *set_charset_name; -static uint8 set_charset_number; static CHARSET_INFO *set_charset; static const char *type_names[]= @@ -607,9 +606,9 @@ static int myisamchk(MI_CHECK *param, my_string filename) (((ulonglong) 1L << share->base.keys)-1)) || test_if_almost_full(info) || 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)) { VOID(fprintf(stderr, |