From f7711e851b350c8c453dc805cd96cda2af3db7c3 Mon Sep 17 00:00:00 2001
From: "bar@bar.mysql.r18.ru" <>
Date: Thu, 19 Dec 2002 09:38:25 +0400
Subject: Introducing SAPDB-style    "fieldname CHAR(n) UNICODE" as a synonym
 to    "fieldname CHAR(n) CHARACTER SET ucs2"

---
 mysql-test/r/ctype_many.result | 3 ++-
 mysql-test/t/ctype_many.test   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'mysql-test')

diff --git a/mysql-test/r/ctype_many.result b/mysql-test/r/ctype_many.result
index ddc3989282b..0dac6e1318f 100644
--- a/mysql-test/r/ctype_many.result
+++ b/mysql-test/r/ctype_many.result
@@ -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..650badfa39c 100644
--- a/mysql-test/t/ctype_many.test
+++ b/mysql-test/t/ctype_many.test
@@ -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');
-- 
cgit v1.2.1


From 9c94dea185dc60bf660205f3055e0504546fc30b Mon Sep 17 00:00:00 2001
From: "bar@bar.mysql.r18.ru" <>
Date: Thu, 19 Dec 2002 09:38:26 +0400
Subject:   SAPDB-style syntax CREATE TABLE tname (a CHAR(10) ASCII)   as a
 synonym for CREATE TABLE tname (a CHAR(10) CHARACTER SET latin1)

---
 mysql-test/r/ctype_many.result | 2 +-
 mysql-test/t/ctype_many.test   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'mysql-test')

diff --git a/mysql-test/r/ctype_many.result b/mysql-test/r/ctype_many.result
index 0dac6e1318f..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;
diff --git a/mysql-test/t/ctype_many.test b/mysql-test/t/ctype_many.test
index 650badfa39c..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;
 
-- 
cgit v1.2.1