summaryrefslogtreecommitdiff
path: root/myisam
diff options
context:
space:
mode:
authorunknown <tim@white.box>2001-08-21 19:07:28 -0400
committerunknown <tim@white.box>2001-08-21 19:07:28 -0400
commit3a6db1d65f0459e0b7b993afbe247c8d6f62849b (patch)
tree50a2ae41827f18e96d2d9bc284b2a3e609434684 /myisam
parent001f7fb5d379dcd38d2d861529301838a6d11e22 (diff)
downloadmariadb-git-3a6db1d65f0459e0b7b993afbe247c8d6f62849b.tar.gz
myisamchk.c Make --set-character-set actually do something.
myisam/myisamchk.c: Make --set-character-set actually do something.
Diffstat (limited to 'myisam')
-rw-r--r--myisam/myisamchk.c5
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,