Preparing to use my_charset_bin instead of binary_flag

include/m_ctype.h

@@ -48,6 +48,7 @@ typedef struct unicase_info_st {
 #define MY_CS_CONFIG    2      /* sets that have a *.conf file   */
 #define MY_CS_INDEX     4      /* sets listed in the Index file  */
 #define MY_CS_LOADED    8      /* sets that are currently loaded */
+#define MY_CS_BINSORT	16     /* if binary sort order           */
 
 #define MY_CHARSET_UNDEFINED 0
 #define MY_CHARSET_CURRENT (default_charset_info->number)
@@ -116,6 +117,7 @@ typedef struct charset_info_st
 } CHARSET_INFO;
 
 
+extern CHARSET_INFO *my_charset_bin;
 extern CHARSET_INFO *default_charset_info;
 extern CHARSET_INFO *system_charset_info;
 extern CHARSET_INFO *all_charsets[256];

strings/ctype-bin.c

@@ -146,10 +146,10 @@ void my_hash_sort_bin(CHARSET_INFO *cs __attribute__((unused)),
 
 
 
-CHARSET_INFO my_charset_bin =
+static CHARSET_INFO my_charset_bin_st =
 {
     63,				/* number       */
-    MY_CS_COMPILED,		/* state         */
+    MY_CS_COMPILED|MY_CS_BINSORT,/* state         */
     "binary",			/* name          */
     "",				/* comment       */
     NULL,			/* ctype         */
@@ -180,3 +180,5 @@ CHARSET_INFO my_charset_bin =
     255				/* max_sort_char */
 };
 
+
+CHARSET_INFO *my_charset_bin = &my_charset_bin_st;

strings/ctype.c

@@ -3658,7 +3658,6 @@ CHARSET_INFO *system_charset_info = &compiled_charsets[0];
 #define MY_ADD_CHARSET(x)	all_charsets[(x)->number]=(x)
 
 
-extern CHARSET_INFO my_charset_bin;
 extern CHARSET_INFO my_charset_big5;
 extern CHARSET_INFO my_charset_czech;
 extern CHARSET_INFO my_charset_euc_kr;
@@ -3677,7 +3676,7 @@ my_bool init_compiled_charsets(myf flags  __attribute__((unused)))
 {
   CHARSET_INFO *cs;
 
-  MY_ADD_CHARSET(&my_charset_bin);
+  MY_ADD_CHARSET(my_charset_bin);
 
 #ifdef HAVE_CHARSET_big5
   MY_ADD_CHARSET(&my_charset_big5);