diff options
author | unknown <anozdrin/alik@quad.> | 2008-02-08 20:06:05 +0300 |
---|---|---|
committer | unknown <anozdrin/alik@quad.> | 2008-02-08 20:06:05 +0300 |
commit | d84f322a978831f015d325ea2df8207ed7e8e6d2 (patch) | |
tree | c96ac08761eb69141d2b5b6f8eec0db1561ebf1a /mysql-test/r/create.result | |
parent | 13e44e30eb4fa588687ae4cc07e675aad08fd2ca (diff) | |
download | mariadb-git-d84f322a978831f015d325ea2df8207ed7e8e6d2.tar.gz |
Fix create.test: use latin1 instead ucs2.
Diffstat (limited to 'mysql-test/r/create.result')
-rw-r--r-- | mysql-test/r/create.result | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/r/create.result b/mysql-test/r/create.result index 13192dca969..4bdcca81b74 100644 --- a/mysql-test/r/create.result +++ b/mysql-test/r/create.result @@ -1759,7 +1759,7 @@ c3 INT NOT NULL COMMENT 'column3', c4 VARCHAR(255) CHARACTER SET utf8 NOT NULL DEFAULT 'a', c5 VARCHAR(255) COLLATE utf8_unicode_ci NULL DEFAULT 'b', c6 VARCHAR(255)) -COLLATE ucs2_unicode_ci; +COLLATE latin1_bin; SHOW CREATE TABLE t1; Table Create Table @@ -1769,8 +1769,8 @@ t1 CREATE TABLE `t1` ( `c3` int(11) NOT NULL COMMENT 'column3', `c4` varchar(255) CHARACTER SET utf8 NOT NULL DEFAULT 'a', `c5` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT 'b', - `c6` varchar(255) COLLATE ucs2_unicode_ci DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=ucs2 COLLATE=ucs2_unicode_ci + `c6` varchar(255) COLLATE latin1_bin DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_bin CREATE TABLE t2 AS SELECT * FROM t1; @@ -1782,7 +1782,7 @@ t2 CREATE TABLE `t2` ( `c3` int(11) NOT NULL COMMENT 'column3', `c4` varchar(255) CHARACTER SET utf8 NOT NULL DEFAULT 'a', `c5` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT 'b', - `c6` varchar(255) CHARACTER SET ucs2 COLLATE ucs2_unicode_ci DEFAULT NULL + `c6` varchar(255) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 DROP TABLE t2; |