diff options
| author | hf@deer.mysql.r18.ru <> | 2002-12-19 14:57:24 +0400 |
|---|---|---|
| committer | hf@deer.mysql.r18.ru <> | 2002-12-19 14:57:24 +0400 |
| commit | 8a205e4ba309c4031df93cfe700891d362e25750 (patch) | |
| tree | 49af941597a25a7ac4b9152abdbeba746334ac2e /mysql-test | |
| parent | 1873df00a5c8d3a92086623db3dd90bfec4b5221 (diff) | |
| parent | c3053148f489b36378efa3bdf6676ca0334f69d1 (diff) | |
| download | mariadb-git-8a205e4ba309c4031df93cfe700891d362e25750.tar.gz | |
Merge
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/ctype_many.result | 5 | ||||
| -rw-r--r-- | mysql-test/t/ctype_many.test | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/mysql-test/r/ctype_many.result b/mysql-test/r/ctype_many.result index ddc3989282b..45fe91c096d 100644 --- a/mysql-test/r/ctype_many.result +++ b/mysql-test/r/ctype_many.result @@ -1,6 +1,6 @@ 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; SHOW CREATE TABLE t1; @@ -1291,7 +1291,8 @@ CYR CAPIT YA CYR CAPIT YA CYR CAPIT YA CYR SMALL YA CYR SMALL YA CYR CAPIT YA CYR SMALL YA CYR SMALL YA -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'); INSERT INTO t1 (ucs2_f,comment) VALUES (0x0393,'GREEK CAPIT GAMMA'); 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'); |