koi8_ru -> koi8_r

charset.conf -> charset.xml
bug fix

mysql-test/r/ctype_many.result

 DROP TABLE IF EXISTS t1;
 CREATE TABLE t1 (
 comment CHAR(32) ASCII NOT NULL,
-koi8_ru_f CHAR(32) CHARACTER SET koi8_ru NOT NULL
+koi8_ru_f CHAR(32) CHARACTER SET koi8_r NOT NULL
 ) CHARSET=latin5;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `comment` char(32) character set latin1 NOT NULL default '',
-  `koi8_ru_f` char(32) character set koi8_ru NOT NULL default ''
+  `koi8_ru_f` char(32) character set koi8_r NOT NULL default ''
 ) TYPE=MyISAM CHARSET=latin5
 ALTER TABLE t1 CHANGE comment comment CHAR(32) CHARACTER SET latin2 NOT NULL;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `comment` char(32) character set latin2 NOT NULL default '',
-  `koi8_ru_f` char(32) character set koi8_ru NOT NULL default ''
+  `koi8_ru_f` char(32) character set koi8_r NOT NULL default ''
 ) TYPE=MyISAM CHARSET=latin5
 ALTER TABLE t1 ADD latin5_f CHAR(32) NOT NULL;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `comment` char(32) character set latin2 NOT NULL default '',
-  `koi8_ru_f` char(32) character set koi8_ru NOT NULL default '',
+  `koi8_ru_f` char(32) character set koi8_r NOT NULL default '',
   `latin5_f` char(32) character set latin5 NOT NULL default ''
 ) TYPE=MyISAM CHARSET=latin5
 ALTER TABLE t1 CHARSET=latin2;
@@ -30,7 +30,7 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `comment` char(32) character set latin2 NOT NULL default '',
-  `koi8_ru_f` char(32) character set koi8_ru NOT NULL default '',
+  `koi8_ru_f` char(32) character set koi8_r NOT NULL default '',
   `latin5_f` char(32) character set latin5 NOT NULL default '',
   `latin2_f` char(32) character set latin2 NOT NULL default ''
 ) TYPE=MyISAM CHARSET=latin2
@@ -39,7 +39,7 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `comment` char(32) character set latin2 NOT NULL default '',
-  `koi8_ru_f` char(32) character set koi8_ru NOT NULL default ''
+  `koi8_ru_f` char(32) character set koi8_r NOT NULL default ''
 ) TYPE=MyISAM CHARSET=latin2
 INSERT INTO t1 (koi8_ru_f,comment) VALUES ('a','LAT SMALL A');
 INSERT INTO t1 (koi8_ru_f,comment) VALUES ('b','LAT SMALL B');
@@ -1061,7 +1061,7 @@ CYR SMALL YA	CYR CAPIT YA
 CYR SMALL YA	CYR SMALL YA
 SELECT t11.comment,t12.comment 
 FROM t1 t11,t1 t12 
-WHERE t11.koi8_ru_f=CONVERT(t12.utf8_f USING koi8_ru)
+WHERE t11.koi8_ru_f=CONVERT(t12.utf8_f USING koi8_r)
 ORDER BY t12.utf8_f,t11.comment,t12.comment;
 comment	comment
 LAT CAPIT A	LAT CAPIT A

mysql-test/t/ctype_many.test

@@ -2,7 +2,7 @@ DROP TABLE IF EXISTS t1;
 
 CREATE TABLE t1 (
   comment CHAR(32) ASCII NOT NULL,
-  koi8_ru_f CHAR(32) CHARACTER SET koi8_ru NOT NULL
+  koi8_ru_f CHAR(32) CHARACTER SET koi8_r NOT NULL
 ) CHARSET=latin5;
 
 SHOW CREATE TABLE t1;
@@ -156,7 +156,7 @@ ORDER BY t11.koi8_ru_f,t11.comment,t12.comment;
 
 SELECT t11.comment,t12.comment 
 FROM t1 t11,t1 t12 
-WHERE t11.koi8_ru_f=CONVERT(t12.utf8_f USING koi8_ru)
+WHERE t11.koi8_ru_f=CONVERT(t12.utf8_f USING koi8_r)
 ORDER BY t12.utf8_f,t11.comment,t12.comment;
 
 ALTER TABLE t1 ADD ucs2_f CHAR(32) CHARACTER SET ucs2;

sql/share/Makefile.am

@@ -25,8 +25,7 @@ install-data-local:
 	done
 	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/charsets
 	$(INSTALL_DATA) $(srcdir)/charsets/README $(DESTDIR)$(pkgdatadir)/charsets/README
-	$(INSTALL_DATA) $(srcdir)/charsets/Index.xml $(DESTDIR)$(pkgdatadir)/charsets/Index.xml
-	$(INSTALL_DATA) $(srcdir)/charsets/*.conf $(DESTDIR)$(pkgdatadir)/charsets
+	$(INSTALL_DATA) $(srcdir)/charsets/*.xml $(DESTDIR)$(pkgdatadir)/charsets
 
 fix_errors:
 	for lang in @AVAILABLE_LANGUAGES@; \

strings/ctype-simple.c

@@ -432,7 +432,7 @@ ulong      my_strntoul_8bit(CHARSET_INFO *cs,
       c -= '0';
     else if (c>='A' && c<='F')
       c = c - 'A' + 10;
-    else if (c>='a' && c<='a')
+    else if (c>='a' && c<='f')
       c = c - 'a' + 10;
     else
       break;