Variables were rename, binary collation names were added

Fixed that SHOW CHARACTER SET displayed non-dynamic charsets even if they were not really compiled

13 files changed, 16 insertions, 14 deletions

diff --git a/strings/ctype-big5.c b/strings/ctype-big5.c
index 57ee2d7c6ae..ec723e8690a 100644
--- a/strings/ctype-big5.c
+++ b/strings/ctype-big5.c
@@ -6226,7 +6226,7 @@ my_mb_wc_big5(CHARSET_INFO *cs __attribute__((unused)),
   return 2;
 }
 
-CHARSET_INFO my_charset_big5 =
+CHARSET_INFO my_charset_big5_chinese_ci =
 {
     1,0,0, 		/* number     */
     MY_CS_COMPILED|MY_CS_PRIMARY|MY_CS_STRNXFRM,	/* state      */
diff --git a/strings/ctype-czech.c b/strings/ctype-czech.c
index 9da2103fda3..788cd96ad13 100644
--- a/strings/ctype-czech.c
+++ b/strings/ctype-czech.c
@@ -605,7 +605,7 @@ int my_strnncollsp_czech(CHARSET_INFO * cs,
 }
 
 
-CHARSET_INFO my_charset_czech =
+CHARSET_INFO my_charset_latin2_czech_ci =
 {
     2,0,0,				/* number */
     MY_CS_COMPILED|MY_CS_STRNXFRM,	/* state      */
diff --git a/strings/ctype-euc_kr.c b/strings/ctype-euc_kr.c
index 21f01b6509c..3bf689910e6 100644
--- a/strings/ctype-euc_kr.c
+++ b/strings/ctype-euc_kr.c
@@ -8634,7 +8634,7 @@ my_mb_wc_euc_kr(CHARSET_INFO *cs __attribute__((unused)),
   return 2;
 }
 
-CHARSET_INFO my_charset_euc_kr =
+CHARSET_INFO my_charset_euckr_korean_ci =
 {
     19,0,0,		/* number */
     MY_CS_COMPILED|MY_CS_PRIMARY,	/* state      */
diff --git a/strings/ctype-gb2312.c b/strings/ctype-gb2312.c
index f1ec5a9f363..20e1ce888e8 100644
--- a/strings/ctype-gb2312.c
+++ b/strings/ctype-gb2312.c
@@ -5684,7 +5684,7 @@ my_mb_wc_gb2312(CHARSET_INFO *cs  __attribute__((unused)),
   return 2;
 }
 
-CHARSET_INFO my_charset_gb2312 =
+CHARSET_INFO my_charset_gb2312_chinese_ci =
 {
     24,0,0,		/* number */
     MY_CS_COMPILED|MY_CS_PRIMARY,	/* state      */
diff --git a/strings/ctype-gbk.c b/strings/ctype-gbk.c
index b1ea209d6ad..ec0cc01881b 100644
--- a/strings/ctype-gbk.c
+++ b/strings/ctype-gbk.c
@@ -9881,7 +9881,7 @@ my_mb_wc_gbk(CHARSET_INFO *cs __attribute__((unused)),
   
 }
 
-CHARSET_INFO my_charset_gbk =
+CHARSET_INFO my_charset_gbk_chinese_ci =
 {
     28,0,0,		/* number */
     MY_CS_COMPILED|MY_CS_PRIMARY|MY_CS_STRNXFRM,	/* state      */
diff --git a/strings/ctype-latin1.c b/strings/ctype-latin1.c
index 5781013a5e9..4340d0973aa 100644
--- a/strings/ctype-latin1.c
+++ b/strings/ctype-latin1.c
@@ -428,7 +428,7 @@ static int my_strnxfrm_latin1_de(CHARSET_INFO *cs __attribute__((unused)),
   return dest - dest_orig;
 }
 
-CHARSET_INFO my_charset_latin1_de =
+CHARSET_INFO my_charset_latin1_german2_ci =
 {
     31,0,0,				/* number    */
     MY_CS_COMPILED|MY_CS_STRNXFRM,	/* state     */
diff --git a/strings/ctype-sjis.c b/strings/ctype-sjis.c
index fd911f1867e..058558fa419 100644
--- a/strings/ctype-sjis.c
+++ b/strings/ctype-sjis.c
@@ -4468,7 +4468,7 @@ my_mb_wc_sjis(CHARSET_INFO *cs  __attribute__((unused)),
   return 2;
 }
 
-CHARSET_INFO my_charset_sjis =
+CHARSET_INFO my_charset_sjis_japanese_ci =
 {
     13,0,0,		/* number */
     MY_CS_COMPILED|MY_CS_PRIMARY|MY_CS_STRNXFRM,	/* state      */
diff --git a/strings/ctype-tis620.c b/strings/ctype-tis620.c
index e108ffac6af..9fcecdfdffd 100644
--- a/strings/ctype-tis620.c
+++ b/strings/ctype-tis620.c
@@ -688,7 +688,7 @@ void ThNormalize(uchar* ptr, uint field_length, const uchar* from, uint length)
 }
 
 
-CHARSET_INFO my_charset_tis620 =
+CHARSET_INFO my_charset_tis620_thai_ci =
 {
     18,0,0,		/* number    */
     MY_CS_COMPILED|MY_CS_PRIMARY|MY_CS_STRNXFRM,	/* state     */
diff --git a/strings/ctype-ucs2.c b/strings/ctype-ucs2.c
index d2e75d1de9e..dae0632f754 100644
--- a/strings/ctype-ucs2.c
+++ b/strings/ctype-ucs2.c
@@ -997,10 +997,10 @@ uint my_charpos_ucs2(CHARSET_INFO *cs __attribute__((unused)),
   return pos*2;
 }
 
-CHARSET_INFO my_charset_ucs2 =
+CHARSET_INFO my_charset_ucs2_general_ci =
 {
     35,0,0,		/* number       */
-    MY_CS_COMPILED|MY_CS_PRIMARY|MY_CS_STRNXFRM,	/* state        */
+    MY_CS_COMPILED|MY_CS_PRIMARY|MY_CS_STRNXFRM|MY_CS_UNICODE,	/* state */
     "ucs2",		/* cs name    */
     "ucs2_general_ci",	/* name         */
     "",			/* comment      */
diff --git a/strings/ctype-ujis.c b/strings/ctype-ujis.c
index 8a9863f7940..76c69637906 100644
--- a/strings/ctype-ujis.c
+++ b/strings/ctype-ujis.c
@@ -8425,7 +8425,7 @@ my_wc_mb_euc_jp(CHARSET_INFO *c,my_wc_t wc, unsigned char *s, unsigned char *e)
   return MY_CS_ILUNI;
 }
 
-CHARSET_INFO my_charset_ujis =
+CHARSET_INFO my_charset_ujis_japanese_ci =
 {
     12,0,0,		/* number       */
     MY_CS_COMPILED|MY_CS_PRIMARY,	/* state        */
diff --git a/strings/ctype-utf8.c b/strings/ctype-utf8.c
index e9fc2f6d17d..9f08ca2e169 100644
--- a/strings/ctype-utf8.c
+++ b/strings/ctype-utf8.c
@@ -1950,10 +1950,10 @@ static int my_mbcharlen_utf8(CHARSET_INFO *cs  __attribute__((unused)) , uint c)
   return 0; /* Illegal mb head */;
 }
 
-CHARSET_INFO my_charset_utf8 =
+CHARSET_INFO my_charset_utf8_general_ci =
 {
     33,0,0,		/* number       */
-    MY_CS_COMPILED|MY_CS_PRIMARY|MY_CS_STRNXFRM,	/* state        */
+    MY_CS_COMPILED|MY_CS_PRIMARY|MY_CS_STRNXFRM|MY_CS_UNICODE,	/* state  */
     "utf8",		/* cs name      */
     "utf8_general_ci",	/* name         */
     "",			/* comment      */
diff --git a/strings/ctype-win1250ch.c b/strings/ctype-win1250ch.c
index 2769925b54f..87ba58d0553 100644
--- a/strings/ctype-win1250ch.c
+++ b/strings/ctype-win1250ch.c
@@ -640,7 +640,7 @@ static my_bool my_like_range_win1250ch(CHARSET_INFO *cs __attribute__((unused)),
 }
 
 
-CHARSET_INFO my_charset_win1250ch =
+CHARSET_INFO my_charset_cp1250_czech_ci =
 {
     34,0,0,			/* number    */
     MY_CS_COMPILED|MY_CS_STRNXFRM,		/* state     */
diff --git a/strings/ctype.c b/strings/ctype.c
index 68d9a30048f..ce7bb9ca4a4 100644
--- a/strings/ctype.c
+++ b/strings/ctype.c
@@ -220,6 +220,8 @@ static int cs_value(MY_XML_PARSER *st,const char *attr, uint len)
       i->cs.state|= MY_CS_PRIMARY;
     else if (!strncmp("binary",attr,len))
       i->cs.state|= MY_CS_BINSORT;
+    else if (!strncmp("compiled",attr,len))
+      i->cs.state|= MY_CS_COMPILED;
     break;
   case _CS_UPPERMAP:
     fill_uchar(i->to_upper,MY_CS_TO_UPPER_TABLE_SIZE,attr,len);