Many files:

  PRIMARY flag for built-in charsets


strings/ctype-big5.c:
  PRIMARY flag for built-in charsets
strings/ctype-bin.c:
  PRIMARY flag for built-in charsets
strings/ctype-euc_kr.c:
  PRIMARY flag for built-in charsets
strings/ctype-gb2312.c:
  PRIMARY flag for built-in charsets
strings/ctype-gbk.c:
  PRIMARY flag for built-in charsets
strings/ctype-sjis.c:
  PRIMARY flag for built-in charsets
strings/ctype-tis620.c:
  PRIMARY flag for built-in charsets
strings/ctype-ujis.c:
  PRIMARY flag for built-in charsets
strings/ctype-utf8.c:
  PRIMARY flag for built-in charsets
strings/ctype.c:
  PRIMARY flag for built-in charsets

10 files changed, 11 insertions, 11 deletions

diff --git a/strings/ctype-big5.c b/strings/ctype-big5.c
index 74ff300c9e9..408c7f8fe35 100644
--- a/strings/ctype-big5.c
+++ b/strings/ctype-big5.c
@@ -6218,7 +6218,7 @@ my_mb_wc_big5(CHARSET_INFO *cs __attribute__((unused)),
 CHARSET_INFO my_charset_big5 =
 {
     1,			/* number     */
-    MY_CS_COMPILED,	/* state      */
+    MY_CS_COMPILED|MY_CS_PRIMARY,	/* state      */
     "big5",		/* cs name    */
     "big5",		/* name       */
     "",			/* comment    */
diff --git a/strings/ctype-bin.c b/strings/ctype-bin.c
index 377e50f3dab..0d7729721ad 100644
--- a/strings/ctype-bin.c
+++ b/strings/ctype-bin.c
@@ -259,7 +259,7 @@ static int my_wildcmp_bin(CHARSET_INFO *cs,
 static CHARSET_INFO my_charset_bin_st =
 {
     63,				/* number        */
-    MY_CS_COMPILED|MY_CS_BINSORT,/* state        */
+    MY_CS_COMPILED|MY_CS_BINSORT|MY_CS_PRIMARY,/* state        */
     "binary",			/* cs name    */
     "binary",			/* name          */
     "",				/* comment       */
diff --git a/strings/ctype-euc_kr.c b/strings/ctype-euc_kr.c
index 6388d4b062f..5a93881a77f 100644
--- a/strings/ctype-euc_kr.c
+++ b/strings/ctype-euc_kr.c
@@ -8636,7 +8636,7 @@ my_mb_wc_euc_kr(CHARSET_INFO *cs __attribute__((unused)),
 CHARSET_INFO my_charset_euc_kr =
 {
     19,			/* number */
-    MY_CS_COMPILED,	/* state      */
+    MY_CS_COMPILED|MY_CS_PRIMARY,	/* state      */
     "euc_kr",		/* cs name    */
     "euc_kr",		/* name */
     "",			/* comment    */
diff --git a/strings/ctype-gb2312.c b/strings/ctype-gb2312.c
index 77a55f6dadc..d575e48a59a 100644
--- a/strings/ctype-gb2312.c
+++ b/strings/ctype-gb2312.c
@@ -5686,7 +5686,7 @@ my_mb_wc_gb2312(CHARSET_INFO *cs  __attribute__((unused)),
 CHARSET_INFO my_charset_gb2312 =
 {
     24,			/* number */
-    MY_CS_COMPILED,	/* state      */
+    MY_CS_COMPILED|MY_CS_PRIMARY,	/* state      */
     "gb2312",		/* cs name    */
     "gb2312",		/* name */
     "",			/* comment    */
diff --git a/strings/ctype-gbk.c b/strings/ctype-gbk.c
index 004c3c778e0..0094a93e5f8 100644
--- a/strings/ctype-gbk.c
+++ b/strings/ctype-gbk.c
@@ -9873,7 +9873,7 @@ my_mb_wc_gbk(CHARSET_INFO *cs __attribute__((unused)),
 CHARSET_INFO my_charset_gbk =
 {
     28,			/* number */
-    MY_CS_COMPILED,	/* state      */
+    MY_CS_COMPILED|MY_CS_PRIMARY,	/* state      */
     "gbk",		/* cs name    */
     "gbk",		/* name */
     "",			/* comment    */
diff --git a/strings/ctype-sjis.c b/strings/ctype-sjis.c
index 1e9a5895683..3949be5e215 100644
--- a/strings/ctype-sjis.c
+++ b/strings/ctype-sjis.c
@@ -4460,7 +4460,7 @@ my_mb_wc_sjis(CHARSET_INFO *cs  __attribute__((unused)),
 CHARSET_INFO my_charset_sjis =
 {
     13,			/* number */
-    MY_CS_COMPILED,	/* state      */
+    MY_CS_COMPILED|MY_CS_PRIMARY,	/* state      */
     "sjis",		/* cs name    */
     "sjis",		/* name */
     "",			/* comment    */
diff --git a/strings/ctype-tis620.c b/strings/ctype-tis620.c
index b448ebdd926..7168026eea5 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 =
 {
     18,			/* number    */
-    MY_CS_COMPILED,	/* state     */
+    MY_CS_COMPILED|MY_CS_PRIMARY,	/* state     */
     "tis620",		/* cs name    */
     "tis620",		/* name      */
     "",			/* comment   */
diff --git a/strings/ctype-ujis.c b/strings/ctype-ujis.c
index 2c3c8dd11c3..0a0024594e4 100644
--- a/strings/ctype-ujis.c
+++ b/strings/ctype-ujis.c
@@ -8430,7 +8430,7 @@ my_wc_mb_euc_jp(CHARSET_INFO *c,my_wc_t wc, unsigned char *s, unsigned char *e)
 CHARSET_INFO my_charset_ujis =
 {
     12,			/* number       */
-    MY_CS_COMPILED,	/* state        */
+    MY_CS_COMPILED|MY_CS_PRIMARY,	/* state        */
     "ujis",		/* cs name    */
     "ujis",		/* name         */
     "",			/* comment      */
diff --git a/strings/ctype-utf8.c b/strings/ctype-utf8.c
index 738bcde92b6..42a70731ab5 100644
--- a/strings/ctype-utf8.c
+++ b/strings/ctype-utf8.c
@@ -1958,7 +1958,7 @@ static int my_mbcharlen_utf8(CHARSET_INFO *cs  __attribute__((unused)) , uint c)
 CHARSET_INFO my_charset_utf8 =
 {
     33,			/* number       */
-    MY_CS_COMPILED,	/* state        */
+    MY_CS_COMPILED|MY_CS_PRIMARY,	/* state        */
     "utf8",		/* cs name      */
     "utf8",		/* name         */
     "",			/* comment      */
@@ -3025,7 +3025,7 @@ cnv:
 CHARSET_INFO my_charset_ucs2 =
 {
     35,			/* number       */
-    MY_CS_COMPILED,	/* state        */
+    MY_CS_COMPILED|MY_CS_PRIMARY,	/* state        */
     "ucs2",		/* cs name    */
     "ucs2",		/* name         */
     "",			/* comment      */
diff --git a/strings/ctype.c b/strings/ctype.c
index e49c0b6614f..589271baa37 100644
--- a/strings/ctype.c
+++ b/strings/ctype.c
@@ -2810,7 +2810,7 @@ static CHARSET_INFO compiled_charsets[] = {
 #ifdef HAVE_CHARSET_latin1
   {
     8,			/* number     */
-    MY_CS_COMPILED,	/* state      */
+    MY_CS_COMPILED|MY_CS_PRIMARY,	/* state      */
     "latin1",		/* cs name    */
     "latin1",		/* name       */
     "",			/* comment    */