merge

3 files changed, 22 insertions, 22 deletions

diff --git a/strings/ctype-cp932.c b/strings/ctype-cp932.c
index 68a13dbedbd..ffab57a7d96 100644
--- a/strings/ctype-cp932.c
+++ b/strings/ctype-cp932.c
@@ -197,7 +197,7 @@ static uint mbcharlen_cp932(CHARSET_INFO *cs __attribute__((unused)),uint c)
 #define cp932code(c,d)	((((uint) (uchar)(c)) << 8) | (uint) (uchar) (d))
 
 
-static const MY_UNICASE_INFO c81[256]=
+static MY_UNICASE_INFO c81[256]=
 {
   /* 8100-810F */
   {0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},
@@ -407,7 +407,7 @@ static const MY_UNICASE_INFO c81[256]=
 };
 
 
-static const MY_UNICASE_INFO c82[256]=
+static MY_UNICASE_INFO c82[256]=
 {
   /* 8200-820F */
   {0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},
@@ -615,7 +615,7 @@ static const MY_UNICASE_INFO c82[256]=
 };
 
 
-static const MY_UNICASE_INFO c83[256]=
+static MY_UNICASE_INFO c83[256]=
 {
   /* 8300-830F */
   {0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},
@@ -825,7 +825,7 @@ static const MY_UNICASE_INFO c83[256]=
 };
 
 
-static const MY_UNICASE_INFO c84[256]=
+static MY_UNICASE_INFO c84[256]=
 {
   /* 8400-840F */
   {0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},
@@ -1035,7 +1035,7 @@ static const MY_UNICASE_INFO c84[256]=
 };
 
 
-static const MY_UNICASE_INFO c87[256]=
+static MY_UNICASE_INFO c87[256]=
 {
   /* 8700-870F */
   {0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},
@@ -1245,7 +1245,7 @@ static const MY_UNICASE_INFO c87[256]=
 };
 
 
-static const MY_UNICASE_INFO cEE[256]=
+static MY_UNICASE_INFO cEE[256]=
 {
   /* EE00-EE0F */
   {0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},
@@ -1456,7 +1456,7 @@ static const MY_UNICASE_INFO cEE[256]=
 };
 
 
-static const MY_UNICASE_INFO cFA[256]=
+static MY_UNICASE_INFO cFA[256]=
 {
   /* FA00-FA0F */
   {0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},
@@ -1666,7 +1666,7 @@ static const MY_UNICASE_INFO cFA[256]=
 };
 
 
-static const MY_UNICASE_INFO *my_caseinfo_cp932[256]=
+static MY_UNICASE_INFO *my_caseinfo_cp932[256]=
 {
   NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, /* 0 */
   NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
diff --git a/strings/ctype-eucjpms.c b/strings/ctype-eucjpms.c
index b2af2cb5608..9ad64ca2457 100644
--- a/strings/ctype-eucjpms.c
+++ b/strings/ctype-eucjpms.c
@@ -203,7 +203,7 @@ static uint mbcharlen_eucjpms(CHARSET_INFO *cs __attribute__((unused)),uint c)
 
 /* Case info pages for JIS-X-0208 range */
 
-static const MY_UNICASE_INFO cA2[256]=
+static MY_UNICASE_INFO cA2[256]=
 {
   {0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0}, /* xx00 */
   {0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},
@@ -324,7 +324,7 @@ static const MY_UNICASE_INFO cA2[256]=
 };
 
 
-static const MY_UNICASE_INFO cA3[256]=
+static MY_UNICASE_INFO cA3[256]=
 {
   {0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0}, /* xx00 */
   {0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},
@@ -445,7 +445,7 @@ static const MY_UNICASE_INFO cA3[256]=
 };
 
 
-static const MY_UNICASE_INFO cA6[256]=
+static MY_UNICASE_INFO cA6[256]=
 {
   {0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0}, /* xx00 */
   {0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},
@@ -566,7 +566,7 @@ static const MY_UNICASE_INFO cA6[256]=
 };
 
 
-static const MY_UNICASE_INFO cA7[256]=
+static MY_UNICASE_INFO cA7[256]=
 {
   {0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0}, /* xx00 */
   {0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},
@@ -687,7 +687,7 @@ static const MY_UNICASE_INFO cA7[256]=
 };
 
 
-static const MY_UNICASE_INFO cAD[256]=
+static MY_UNICASE_INFO cAD[256]=
 {
   {0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0}, /* xx00 */
   {0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},
@@ -810,7 +810,7 @@ static const MY_UNICASE_INFO cAD[256]=
 
 /* Case info pages for JIS-X-0212 range */
 
-static const MY_UNICASE_INFO c8FA6[256]=
+static MY_UNICASE_INFO c8FA6[256]=
 {
   {0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0}, /* xx00 */
   {0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},
@@ -931,7 +931,7 @@ static const MY_UNICASE_INFO c8FA6[256]=
 };
 
 
-static const MY_UNICASE_INFO c8FA7[256]=
+static MY_UNICASE_INFO c8FA7[256]=
 {
   {0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0}, /* xx00 */
   {0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},
@@ -1052,7 +1052,7 @@ static const MY_UNICASE_INFO c8FA7[256]=
 };
 
 
-static const MY_UNICASE_INFO c8FA9[256]=
+static MY_UNICASE_INFO c8FA9[256]=
 {
   {0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0}, /* xx00 */
   {0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},
@@ -1173,7 +1173,7 @@ static const MY_UNICASE_INFO c8FA9[256]=
 };
 
 
-static const MY_UNICASE_INFO c8FAA[256]=
+static MY_UNICASE_INFO c8FAA[256]=
 {
   {0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0}, /* xx00 */
   {0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},
@@ -1294,7 +1294,7 @@ static const MY_UNICASE_INFO c8FAA[256]=
 };
 
 
-static const MY_UNICASE_INFO c8FAB[256]=
+static MY_UNICASE_INFO c8FAB[256]=
 {
   {0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0}, /* xx00 */
   {0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},
@@ -1415,7 +1415,7 @@ static const MY_UNICASE_INFO c8FAB[256]=
 };
 
 
-static const MY_UNICASE_INFO c8FF3[256]=
+static MY_UNICASE_INFO c8FF3[256]=
 {
   {0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0}, /* xx00 */
   {0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},
@@ -1536,7 +1536,7 @@ static const MY_UNICASE_INFO c8FF3[256]=
 };
 
 
-static const MY_UNICASE_INFO c8FF4[256]=
+static MY_UNICASE_INFO c8FF4[256]=
 {
   {0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0}, /* xx00 */
   {0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},
@@ -1657,7 +1657,7 @@ static const MY_UNICASE_INFO c8FF4[256]=
 };
 
 
-static const MY_UNICASE_INFO *my_caseinfo_eucjpms[512]=
+static MY_UNICASE_INFO *my_caseinfo_eucjpms[512]=
 {
   /* JIS-X-0208 */
   NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, /* 0 */
diff --git a/strings/ctype-gbk.c b/strings/ctype-gbk.c
index a33d0d82f56..601bbabddb5 100644
--- a/strings/ctype-gbk.c
+++ b/strings/ctype-gbk.c
@@ -136,7 +136,7 @@ static const uchar to_upper_gbk[]=
   (uchar) '\370',(uchar) '\371',(uchar) '\372',(uchar) '\373',(uchar) '\374',(uchar) '\375',(uchar) '\376',(uchar) '\377',
 };
 
-static const MY_UNICASE_INFO cA2[256]=
+static MY_UNICASE_INFO cA2[256]=
 {
   {0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0}, /* xx00 */
   {0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},