diff options
| author | unknown <Sinisa@sinisa.nasamreza.org> | 2002-12-19 07:38:27 +0200 |
|---|---|---|
| committer | unknown <Sinisa@sinisa.nasamreza.org> | 2002-12-19 07:38:27 +0200 |
| commit | af4bafa47f55905d1fff968506ba77b393b4a5e0 (patch) | |
| tree | c9d32862633cb0340546baeec1f53c4caffd33f3 /mysql-test/r | |
| parent | eb377d06b60955f544c2b8f1b80d2255bae91061 (diff) | |
| parent | 0a11536c73d476bafb90c625adf9df392c2549a9 (diff) | |
| download | mariadb-git-af4bafa47f55905d1fff968506ba77b393b4a5e0.tar.gz | |
Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
Diffstat (limited to 'mysql-test/r')
| -rw-r--r-- | mysql-test/r/ctype_many.result | 5 |
1 files changed, 3 insertions, 2 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'); |