ctype_many.test:

  Insert constants with an explicit character set
ctype_many.result:
  Fix according test change


mysql-test/r/ctype_many.result:
  Fix according test change
mysql-test/t/ctype_many.test:
  Insert constants with an explicit character set

1 files changed, 64 insertions, 64 deletions

diff --git a/mysql-test/t/ctype_many.test b/mysql-test/t/ctype_many.test
index 5530eee0dbe..1f9f9cf99cc 100644
--- a/mysql-test/t/ctype_many.test
+++ b/mysql-test/t/ctype_many.test
@@ -70,70 +70,70 @@ INSERT INTO t1 (koi8_ru_f,comment) VALUES ('W','LAT CAPIT W');
 INSERT INTO t1 (koi8_ru_f,comment) VALUES ('X','LAT CAPIT X');
 INSERT INTO t1 (koi8_ru_f,comment) VALUES ('Y','LAT CAPIT Y');
 INSERT INTO t1 (koi8_ru_f,comment) VALUES ('Z','LAT CAPIT Z');
-INSERT INTO t1 (koi8_ru_f,comment) VALUES ('Á','CYR SMALL A');
-INSERT INTO t1 (koi8_ru_f,comment) VALUES ('Â','CYR SMALL BE');
-INSERT INTO t1 (koi8_ru_f,comment) VALUES ('×','CYR SMALL VE');
-INSERT INTO t1 (koi8_ru_f,comment) VALUES ('Ç','CYR SMALL GE');
-INSERT INTO t1 (koi8_ru_f,comment) VALUES ('Ä','CYR SMALL DE');
-INSERT INTO t1 (koi8_ru_f,comment) VALUES ('Å','CYR SMALL IE');
-INSERT INTO t1 (koi8_ru_f,comment) VALUES ('£','CYR SMALL IO');
-INSERT INTO t1 (koi8_ru_f,comment) VALUES ('Ö','CYR SMALL ZHE');
-INSERT INTO t1 (koi8_ru_f,comment) VALUES ('Ú','CYR SMALL ZE');
-INSERT INTO t1 (koi8_ru_f,comment) VALUES ('É','CYR SMALL I');
-INSERT INTO t1 (koi8_ru_f,comment) VALUES ('Ë','CYR SMALL KA');
-INSERT INTO t1 (koi8_ru_f,comment) VALUES ('Ì','CYR SMALL EL');
-INSERT INTO t1 (koi8_ru_f,comment) VALUES ('Í','CYR SMALL EM');
-INSERT INTO t1 (koi8_ru_f,comment) VALUES ('Î','CYR SMALL EN');
-INSERT INTO t1 (koi8_ru_f,comment) VALUES ('Ï','CYR SMALL O');
-INSERT INTO t1 (koi8_ru_f,comment) VALUES ('Ð','CYR SMALL PE');
-INSERT INTO t1 (koi8_ru_f,comment) VALUES ('Ò','CYR SMALL ER');
-INSERT INTO t1 (koi8_ru_f,comment) VALUES ('Ó','CYR SMALL ES');
-INSERT INTO t1 (koi8_ru_f,comment) VALUES ('Ô','CYR SMALL TE');
-INSERT INTO t1 (koi8_ru_f,comment) VALUES ('Õ','CYR SMALL U');
-INSERT INTO t1 (koi8_ru_f,comment) VALUES ('Æ','CYR SMALL EF');
-INSERT INTO t1 (koi8_ru_f,comment) VALUES ('È','CYR SMALL HA');
-INSERT INTO t1 (koi8_ru_f,comment) VALUES ('Ã','CYR SMALL TSE');
-INSERT INTO t1 (koi8_ru_f,comment) VALUES ('Þ','CYR SMALL CHE');
-INSERT INTO t1 (koi8_ru_f,comment) VALUES ('Û','CYR SMALL SHA');
-INSERT INTO t1 (koi8_ru_f,comment) VALUES ('Ý','CYR SMALL SCHA');
-INSERT INTO t1 (koi8_ru_f,comment) VALUES ('ß','CYR SMALL HARD SIGN');
-INSERT INTO t1 (koi8_ru_f,comment) VALUES ('Ù','CYR SMALL YERU');
-INSERT INTO t1 (koi8_ru_f,comment) VALUES ('Ø','CYR SMALL SOFT SIGN');
-INSERT INTO t1 (koi8_ru_f,comment) VALUES ('Ü','CYR SMALL E');
-INSERT INTO t1 (koi8_ru_f,comment) VALUES ('À','CYR SMALL YU');
-INSERT INTO t1 (koi8_ru_f,comment) VALUES ('Ñ','CYR SMALL YA');
-INSERT INTO t1 (koi8_ru_f,comment) VALUES ('á','CYR CAPIT A');
-INSERT INTO t1 (koi8_ru_f,comment) VALUES ('â','CYR CAPIT BE');
-INSERT INTO t1 (koi8_ru_f,comment) VALUES ('÷','CYR CAPIT VE');
-INSERT INTO t1 (koi8_ru_f,comment) VALUES ('ç','CYR CAPIT GE');
-INSERT INTO t1 (koi8_ru_f,comment) VALUES ('ä','CYR CAPIT DE');
-INSERT INTO t1 (koi8_ru_f,comment) VALUES ('å','CYR CAPIT IE');
-INSERT INTO t1 (koi8_ru_f,comment) VALUES ('³','CYR CAPIT IO');
-INSERT INTO t1 (koi8_ru_f,comment) VALUES ('ö','CYR CAPIT ZHE');
-INSERT INTO t1 (koi8_ru_f,comment) VALUES ('ú','CYR CAPIT ZE');
-INSERT INTO t1 (koi8_ru_f,comment) VALUES ('é','CYR CAPIT I');
-INSERT INTO t1 (koi8_ru_f,comment) VALUES ('ë','CYR CAPIT KA');
-INSERT INTO t1 (koi8_ru_f,comment) VALUES ('ì','CYR CAPIT EL');
-INSERT INTO t1 (koi8_ru_f,comment) VALUES ('í','CYR CAPIT EM');
-INSERT INTO t1 (koi8_ru_f,comment) VALUES ('î','CYR CAPIT EN');
-INSERT INTO t1 (koi8_ru_f,comment) VALUES ('ï','CYR CAPIT O');
-INSERT INTO t1 (koi8_ru_f,comment) VALUES ('ð','CYR CAPIT PE');
-INSERT INTO t1 (koi8_ru_f,comment) VALUES ('ò','CYR CAPIT ER');
-INSERT INTO t1 (koi8_ru_f,comment) VALUES ('ó','CYR CAPIT ES');
-INSERT INTO t1 (koi8_ru_f,comment) VALUES ('ô','CYR CAPIT TE');
-INSERT INTO t1 (koi8_ru_f,comment) VALUES ('õ','CYR CAPIT U');
-INSERT INTO t1 (koi8_ru_f,comment) VALUES ('æ','CYR CAPIT EF');
-INSERT INTO t1 (koi8_ru_f,comment) VALUES ('è','CYR CAPIT HA');
-INSERT INTO t1 (koi8_ru_f,comment) VALUES ('ã','CYR CAPIT TSE');
-INSERT INTO t1 (koi8_ru_f,comment) VALUES ('þ','CYR CAPIT CHE');
-INSERT INTO t1 (koi8_ru_f,comment) VALUES ('û','CYR CAPIT SHA');
-INSERT INTO t1 (koi8_ru_f,comment) VALUES ('ý','CYR CAPIT SCHA');
-INSERT INTO t1 (koi8_ru_f,comment) VALUES ('ÿ','CYR CAPIT HARD SIGN');
-INSERT INTO t1 (koi8_ru_f,comment) VALUES ('ù','CYR CAPIT YERU');
-INSERT INTO t1 (koi8_ru_f,comment) VALUES ('ø','CYR CAPIT SOFT SIGN');
-INSERT INTO t1 (koi8_ru_f,comment) VALUES ('ü','CYR CAPIT E');
-INSERT INTO t1 (koi8_ru_f,comment) VALUES ('à','CYR CAPIT YU');
-INSERT INTO t1 (koi8_ru_f,comment) VALUES ('ñ','CYR CAPIT YA');
+INSERT INTO t1 (koi8_ru_f,comment) VALUES (_koi8r'Á','CYR SMALL A');
+INSERT INTO t1 (koi8_ru_f,comment) VALUES (_koi8r'Â','CYR SMALL BE');
+INSERT INTO t1 (koi8_ru_f,comment) VALUES (_koi8r'×','CYR SMALL VE');
+INSERT INTO t1 (koi8_ru_f,comment) VALUES (_koi8r'Ç','CYR SMALL GE');
+INSERT INTO t1 (koi8_ru_f,comment) VALUES (_koi8r'Ä','CYR SMALL DE');
+INSERT INTO t1 (koi8_ru_f,comment) VALUES (_koi8r'Å','CYR SMALL IE');
+INSERT INTO t1 (koi8_ru_f,comment) VALUES (_koi8r'£','CYR SMALL IO');
+INSERT INTO t1 (koi8_ru_f,comment) VALUES (_koi8r'Ö','CYR SMALL ZHE');
+INSERT INTO t1 (koi8_ru_f,comment) VALUES (_koi8r'Ú','CYR SMALL ZE');
+INSERT INTO t1 (koi8_ru_f,comment) VALUES (_koi8r'É','CYR SMALL I');
+INSERT INTO t1 (koi8_ru_f,comment) VALUES (_koi8r'Ë','CYR SMALL KA');
+INSERT INTO t1 (koi8_ru_f,comment) VALUES (_koi8r'Ì','CYR SMALL EL');
+INSERT INTO t1 (koi8_ru_f,comment) VALUES (_koi8r'Í','CYR SMALL EM');
+INSERT INTO t1 (koi8_ru_f,comment) VALUES (_koi8r'Î','CYR SMALL EN');
+INSERT INTO t1 (koi8_ru_f,comment) VALUES (_koi8r'Ï','CYR SMALL O');
+INSERT INTO t1 (koi8_ru_f,comment) VALUES (_koi8r'Ð','CYR SMALL PE');
+INSERT INTO t1 (koi8_ru_f,comment) VALUES (_koi8r'Ò','CYR SMALL ER');
+INSERT INTO t1 (koi8_ru_f,comment) VALUES (_koi8r'Ó','CYR SMALL ES');
+INSERT INTO t1 (koi8_ru_f,comment) VALUES (_koi8r'Ô','CYR SMALL TE');
+INSERT INTO t1 (koi8_ru_f,comment) VALUES (_koi8r'Õ','CYR SMALL U');
+INSERT INTO t1 (koi8_ru_f,comment) VALUES (_koi8r'Æ','CYR SMALL EF');
+INSERT INTO t1 (koi8_ru_f,comment) VALUES (_koi8r'È','CYR SMALL HA');
+INSERT INTO t1 (koi8_ru_f,comment) VALUES (_koi8r'Ã','CYR SMALL TSE');
+INSERT INTO t1 (koi8_ru_f,comment) VALUES (_koi8r'Þ','CYR SMALL CHE');
+INSERT INTO t1 (koi8_ru_f,comment) VALUES (_koi8r'Û','CYR SMALL SHA');
+INSERT INTO t1 (koi8_ru_f,comment) VALUES (_koi8r'Ý','CYR SMALL SCHA');
+INSERT INTO t1 (koi8_ru_f,comment) VALUES (_koi8r'ß','CYR SMALL HARD SIGN');
+INSERT INTO t1 (koi8_ru_f,comment) VALUES (_koi8r'Ù','CYR SMALL YERU');
+INSERT INTO t1 (koi8_ru_f,comment) VALUES (_koi8r'Ø','CYR SMALL SOFT SIGN');
+INSERT INTO t1 (koi8_ru_f,comment) VALUES (_koi8r'Ü','CYR SMALL E');
+INSERT INTO t1 (koi8_ru_f,comment) VALUES (_koi8r'À','CYR SMALL YU');
+INSERT INTO t1 (koi8_ru_f,comment) VALUES (_koi8r'Ñ','CYR SMALL YA');
+INSERT INTO t1 (koi8_ru_f,comment) VALUES (_koi8r'á','CYR CAPIT A');
+INSERT INTO t1 (koi8_ru_f,comment) VALUES (_koi8r'â','CYR CAPIT BE');
+INSERT INTO t1 (koi8_ru_f,comment) VALUES (_koi8r'÷','CYR CAPIT VE');
+INSERT INTO t1 (koi8_ru_f,comment) VALUES (_koi8r'ç','CYR CAPIT GE');
+INSERT INTO t1 (koi8_ru_f,comment) VALUES (_koi8r'ä','CYR CAPIT DE');
+INSERT INTO t1 (koi8_ru_f,comment) VALUES (_koi8r'å','CYR CAPIT IE');
+INSERT INTO t1 (koi8_ru_f,comment) VALUES (_koi8r'³','CYR CAPIT IO');
+INSERT INTO t1 (koi8_ru_f,comment) VALUES (_koi8r'ö','CYR CAPIT ZHE');
+INSERT INTO t1 (koi8_ru_f,comment) VALUES (_koi8r'ú','CYR CAPIT ZE');
+INSERT INTO t1 (koi8_ru_f,comment) VALUES (_koi8r'é','CYR CAPIT I');
+INSERT INTO t1 (koi8_ru_f,comment) VALUES (_koi8r'ë','CYR CAPIT KA');
+INSERT INTO t1 (koi8_ru_f,comment) VALUES (_koi8r'ì','CYR CAPIT EL');
+INSERT INTO t1 (koi8_ru_f,comment) VALUES (_koi8r'í','CYR CAPIT EM');
+INSERT INTO t1 (koi8_ru_f,comment) VALUES (_koi8r'î','CYR CAPIT EN');
+INSERT INTO t1 (koi8_ru_f,comment) VALUES (_koi8r'ï','CYR CAPIT O');
+INSERT INTO t1 (koi8_ru_f,comment) VALUES (_koi8r'ð','CYR CAPIT PE');
+INSERT INTO t1 (koi8_ru_f,comment) VALUES (_koi8r'ò','CYR CAPIT ER');
+INSERT INTO t1 (koi8_ru_f,comment) VALUES (_koi8r'ó','CYR CAPIT ES');
+INSERT INTO t1 (koi8_ru_f,comment) VALUES (_koi8r'ô','CYR CAPIT TE');
+INSERT INTO t1 (koi8_ru_f,comment) VALUES (_koi8r'õ','CYR CAPIT U');
+INSERT INTO t1 (koi8_ru_f,comment) VALUES (_koi8r'æ','CYR CAPIT EF');
+INSERT INTO t1 (koi8_ru_f,comment) VALUES (_koi8r'è','CYR CAPIT HA');
+INSERT INTO t1 (koi8_ru_f,comment) VALUES (_koi8r'ã','CYR CAPIT TSE');
+INSERT INTO t1 (koi8_ru_f,comment) VALUES (_koi8r'þ','CYR CAPIT CHE');
+INSERT INTO t1 (koi8_ru_f,comment) VALUES (_koi8r'û','CYR CAPIT SHA');
+INSERT INTO t1 (koi8_ru_f,comment) VALUES (_koi8r'ý','CYR CAPIT SCHA');
+INSERT INTO t1 (koi8_ru_f,comment) VALUES (_koi8r'ÿ','CYR CAPIT HARD SIGN');
+INSERT INTO t1 (koi8_ru_f,comment) VALUES (_koi8r'ù','CYR CAPIT YERU');
+INSERT INTO t1 (koi8_ru_f,comment) VALUES (_koi8r'ø','CYR CAPIT SOFT SIGN');
+INSERT INTO t1 (koi8_ru_f,comment) VALUES (_koi8r'ü','CYR CAPIT E');
+INSERT INTO t1 (koi8_ru_f,comment) VALUES (_koi8r'à','CYR CAPIT YU');
+INSERT INTO t1 (koi8_ru_f,comment) VALUES (_koi8r'ñ','CYR CAPIT YA');
 
 SELECT CONVERT(koi8_ru_f USING utf8),MIN(comment),COUNT(*) FROM t1 GROUP BY 1;