Merge

1 files changed, 3 insertions, 2 deletions

diff --git a/mysql-test/t/ctype_many.test b/mysql-test/t/ctype_many.test
index 1e89b1419d2..7854bc38d6f 100644
--- a/mysql-test/t/ctype_many.test
+++ b/mysql-test/t/ctype_many.test
@@ -1,7 +1,7 @@
 DROP TABLE IF EXISTS t1;
 
 CREATE TABLE t1 (
-  comment CHAR(32) CHARACTER SET latin1 NOT NULL,
+  comment CHAR(32) ASCII NOT NULL,
   koi8_ru_f CHAR(32) CHARACTER SET koi8_ru NOT NULL
 ) CHARSET=latin5;
 
@@ -156,7 +156,8 @@ FROM t1 t11,t1 t12
 WHERE t11.koi8_ru_f=CONVERT(t12.utf8_f USING koi8_ru)
 ORDER BY t12.utf8_f,t11.comment,t12.comment;
 
-ALTER TABLE t1 ADD ucs2_f CHAR(32) CHARACTER SET ucs2 NOT NULL;
+ALTER TABLE t1 ADD ucs2_f CHAR(32) CHARACTER SET ucs2;
+ALTER TABLE t1 CHANGE ucs2_f ucs2_f CHAR(32) UNICODE NOT NULL;
 
 INSERT INTO t1 (ucs2_f,comment) VALUES (0x0391,'GREEK CAPIT ALPHA');
 INSERT INTO t1 (ucs2_f,comment) VALUES (0x0392,'GREEK CAPIT BETA');