diff options
Diffstat (limited to 'mysql-test/main/ctype_recoding.result')
| -rw-r--r-- | mysql-test/main/ctype_recoding.result | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/mysql-test/main/ctype_recoding.result b/mysql-test/main/ctype_recoding.result index 4668ddf9684..fe2db13b497 100644 --- a/mysql-test/main/ctype_recoding.result +++ b/mysql-test/main/ctype_recoding.result @@ -6,8 +6,8 @@ CREATE TABLE t2 (a CHAR(10) CHARACTER SET utf8); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` char(10) CHARACTER SET cp1251 DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 + `a` char(10) CHARACTER SET cp1251 COLLATE cp1251_general_ci DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT a FROM t1; a @@ -30,8 +30,8 @@ CREATE TABLE t2 (a TEXT CHARACTER SET utf8); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` text CHARACTER SET cp1251 DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 + `a` text CHARACTER SET cp1251 COLLATE cp1251_general_ci DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT HEX(a) FROM t1; HEX(a) EFF0EEE1E0 @@ -50,8 +50,8 @@ Tables_in_test SHOW CREATE TABLE ; Table Create Table CREATE TABLE `` ( - `` char(32) CHARACTER SET koi8r NOT NULL COMMENT ' ' -) ENGINE=MyISAM DEFAULT CHARSET=latin1 COMMENT=' ' + `` char(32) CHARACTER SET koi8r COLLATE koi8r_general_ci NOT NULL COMMENT ' ' +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT=' ' SHOW FIELDS FROM ; Field Type Null Key Default Extra char(32) NO NULL @@ -62,8 +62,8 @@ Tables_in_test SHOW CREATE TABLE ; Table Create Table CREATE TABLE `` ( - `` char(32) CHARACTER SET koi8r NOT NULL COMMENT ' ' -) ENGINE=MyISAM DEFAULT CHARSET=latin1 COMMENT=' ' + `` char(32) CHARACTER SET koi8r COLLATE koi8r_general_ci NOT NULL COMMENT ' ' +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT=' ' SHOW FIELDS FROM ; Field Type Null Key Default Extra char(32) NO NULL @@ -74,8 +74,8 @@ Tables_in_test SHOW CREATE TABLE таблица; Table Create Table таблица CREATE TABLE `таблица` ( - `поле` char(32) CHARACTER SET koi8r NOT NULL COMMENT 'комментарий поля' -) ENGINE=MyISAM DEFAULT CHARSET=latin1 COMMENT='комментарий таблицы' + `поле` char(32) CHARACTER SET koi8r COLLATE koi8r_general_ci NOT NULL COMMENT 'комментарий поля' +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='комментарий таблицы' SHOW FIELDS FROM таблица; Field Type Null Key Default Extra поле char(32) NO NULL @@ -118,13 +118,13 @@ SHOW CREATE TABLE `тест`; Table Create Table тест CREATE TABLE `тест` ( `тест` int(11) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SET NAMES utf8; SHOW CREATE TABLE `тест`; Table Create Table тест CREATE TABLE `тест` ( `тест` int(11) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE `тест`; SET NAMES binary; SET character_set_connection=utf8; @@ -143,7 +143,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `` char(128) DEFAULT '', `1` enum('1','2') DEFAULT '2' -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SHOW COLUMNS FROM t1; Field Type Null Key Default Extra char(128) YES @@ -154,7 +154,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `ä` char(128) DEFAULT 'ä', `ä1` enum('ä1','ä2') DEFAULT 'ä2' -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SHOW COLUMNS FROM t1; Field Type Null Key Default Extra ä char(128) YES ä @@ -261,8 +261,8 @@ create table t1(a char character set cp1251 default _koi8r 0xFF); show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` char(1) CHARACTER SET cp1251 DEFAULT '' -) ENGINE=MyISAM DEFAULT CHARSET=latin1 + `a` char(1) CHARACTER SET cp1251 COLLATE cp1251_general_ci DEFAULT '' +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table t1; create table t1(a char character set latin1 default _cp1251 0xFF); ERROR 42000: Invalid default value for 'a' |