summaryrefslogtreecommitdiff
path: root/mysys/charset.c
diff options
context:
space:
mode:
Diffstat (limited to 'mysys/charset.c')
-rw-r--r--mysys/charset.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/mysys/charset.c b/mysys/charset.c
index c85db725b42..68377aec355 100644
--- a/mysys/charset.c
+++ b/mysys/charset.c
@@ -315,8 +315,8 @@ char *get_charsets_dir(char *buf)
}
CHARSET_INFO *all_charsets[256];
-CHARSET_INFO *default_charset_info = &compiled_charsets[0];
-CHARSET_INFO *system_charset_info = &compiled_charsets[0];
+CHARSET_INFO *default_charset_info = &my_charset_latin1;
+CHARSET_INFO *system_charset_info = &my_charset_latin1;
#define MY_ADD_CHARSET(x) all_charsets[(x)->number]=(x)
@@ -325,7 +325,9 @@ static my_bool init_compiled_charsets(myf flags __attribute__((unused)))
{
CHARSET_INFO *cs;
- MY_ADD_CHARSET(my_charset_bin);
+ MY_ADD_CHARSET(&my_charset_latin1);
+
+ MY_ADD_CHARSET(&my_charset_bin);
#ifdef HAVE_CHARSET_big5
MY_ADD_CHARSET(&my_charset_big5);