bk commit into 5.1 tree (anozdrin:1.2539)

[Alexander Nozdrin]

Below is the list of changes that have just been committed into a local
5.1 repository of anozdrin.  When anozdrin does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-02-08 20:06:05+03:00, anozdrin@quad. +2 -0
  Fix create.test: use latin1 instead ucs2.

  mysql-test/r/create.result@stripped, 2008-02-08 20:06:04+03:00, anozdrin@quad. +4 -4
    Fix create.test: use latin1 instead ucs2.

  mysql-test/t/create.test@stripped, 2008-02-08 20:06:04+03:00, anozdrin@quad. +1 -1
    Fix create.test: use latin1 instead ucs2.

diff -Nrup a/mysql-test/r/create.result b/mysql-test/r/create.result
--- a/mysql-test/r/create.result	2008-02-06 14:55:18 +03:00
+++ b/mysql-test/r/create.result	2008-02-08 20:06:04 +03:00
@@ -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;
diff -Nrup a/mysql-test/t/create.test b/mysql-test/t/create.test
--- a/mysql-test/t/create.test	2008-02-06 14:55:18 +03:00
+++ b/mysql-test/t/create.test	2008-02-08 20:06:04 +03:00
@@ -1363,7 +1363,7 @@ CREATE TABLE t1(
   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;
 
 --echo