diff options
Diffstat (limited to 'mysql-test/r/ctype_recoding.result')
| -rw-r--r-- | mysql-test/r/ctype_recoding.result | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/mysql-test/r/ctype_recoding.result b/mysql-test/r/ctype_recoding.result index 3826792306f..fe5842f9880 100644 --- a/mysql-test/r/ctype_recoding.result +++ b/mysql-test/r/ctype_recoding.result @@ -6,7 +6,7 @@ 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 + `a` char(10) CHARACTER SET cp1251 DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 SELECT a FROM t1; a @@ -30,7 +30,7 @@ CREATE TABLE t2 (a TEXT CHARACTER SET utf8); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` text character set cp1251 + `a` text CHARACTER SET cp1251 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 SELECT HEX(a) FROM t1; HEX(a) @@ -50,7 +50,7 @@ Tables_in_test SHOW CREATE TABLE ; Table Create Table CREATE TABLE `` ( - `` char(32) character set koi8r NOT NULL COMMENT ' ' + `` char(32) CHARACTER SET koi8r NOT NULL COMMENT ' ' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COMMENT=' ' SHOW FIELDS FROM ; Field Type Null Key Default Extra @@ -62,7 +62,7 @@ Tables_in_test SHOW CREATE TABLE ; Table Create Table CREATE TABLE `` ( - `` char(32) character set koi8r NOT NULL COMMENT ' ' + `` char(32) CHARACTER SET koi8r NOT NULL COMMENT ' ' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COMMENT=' ' SHOW FIELDS FROM ; Field Type Null Key Default Extra @@ -74,7 +74,7 @@ Tables_in_test SHOW CREATE TABLE таблица; Table Create Table таблица CREATE TABLE `таблица` ( - `поле` char(32) character set koi8r NOT NULL COMMENT 'комментарий поля' + `поле` char(32) CHARACTER SET koi8r NOT NULL COMMENT 'комментарий поля' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COMMENT='комментарий таблицы' SHOW FIELDS FROM таблица; Field Type Null Key Default Extra @@ -117,13 +117,13 @@ CREATE TABLE `тест` (`тест` int); SHOW CREATE TABLE `тест`; Table Create Table тест CREATE TABLE `тест` ( - `тест` int(11) default NULL + `тест` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 SET NAMES utf8; SHOW CREATE TABLE `тест`; Table Create Table тест CREATE TABLE `тест` ( - `тест` int(11) default NULL + `тест` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 DROP TABLE `тест`; SET NAMES binary; @@ -141,8 +141,8 @@ CREATE TABLE t1 (`` CHAR(128) DEFAULT '', `1` ENUM('1','2') DEFAULT '2'); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `` char(128) default '', - `1` enum('1','2') default '2' + `` char(128) DEFAULT '', + `1` enum('1','2') DEFAULT '2' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 SHOW COLUMNS FROM t1; Field Type Null Key Default Extra @@ -152,8 +152,8 @@ SET NAMES binary; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `ä` char(128) default 'ä', - `ä1` enum('ä1','ä2') default 'ä2' + `ä` char(128) DEFAULT 'ä', + `ä1` enum('ä1','ä2') DEFAULT 'ä2' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 SHOW COLUMNS FROM t1; Field Type Null Key Default Extra @@ -261,7 +261,7 @@ 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 '' + `a` char(1) CHARACTER SET cp1251 DEFAULT '' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; create table t1(a char character set latin1 default _cp1251 0xFF); |