ctype.c:

  koi8_ru -> koi8_r
  koi8_ukr -> koi8_u
  usa7 -> ascii


strings/ctype.c:
  koi8_ru -> koi8_r
  koi8_ukr -> koi8_u
  usa7 -> ascii

strings/ctype.c

@@ -3399,8 +3399,8 @@ static CHARSET_INFO compiled_charsets[] = {
   {
     7,			/* number */
     MY_CS_COMPILED,	/* state      */
-    "koi8_ru",		/* cs name    */
-    "koi8_ru",		/* name */
+    "koi8_r",		/* cs name    */
+    "koi8_r",		/* name */
     "",			/* comment    */
     ctype_koi8_ru,
     to_lower_koi8_ru,
@@ -3444,8 +3444,8 @@ static CHARSET_INFO compiled_charsets[] = {
   {
     22,			/* number */
     MY_CS_COMPILED,	/* state      */
-    "koi8_ukr",		/* cs name    */
-    "koi8_ukr",		/* name */
+    "koi8_u",		/* cs name    */
+    "koi8_u",		/* name */
     "",			/* comment    */
     ctype_koi8_ukr,
     to_lower_koi8_ukr,
@@ -3628,7 +3628,7 @@ static CHARSET_INFO compiled_charsets[] = {
     11,			/* number */
     MY_CS_COMPILED,	/* state      */
     "ascii",		/* cs name    */
-    "usa7",		/* name */
+    "ascii",		/* name */
     "",			/* comment    */
     ctype_usa7,
     to_lower_usa7,