diff options
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/alter_table.result | 10 | ||||
| -rw-r--r-- | mysql-test/r/ctype_collate.result | 4 | ||||
| -rw-r--r-- | mysql-test/t/alter_table.test | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/mysql-test/r/alter_table.result b/mysql-test/r/alter_table.result index 9b90742762e..5166e3bf8cb 100644 --- a/mysql-test/r/alter_table.result +++ b/mysql-test/r/alter_table.result @@ -360,7 +360,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` char(10) character set koi8r default NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 -alter table t1 CHARACTER SET latin1; +alter table t1 CONVERT TO CHARACTER SET latin1, DEFAULT CHARACTER SET latin1; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( @@ -379,15 +379,15 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `myblob` longblob, - `mytext` longtext character set latin1 collate latin1_general_cs -) ENGINE=MyISAM DEFAULT CHARSET=latin1 + `mytext` longtext collate latin1_general_cs +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_cs alter table t1 character set latin2; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `myblob` longblob, - `mytext` longtext character set latin2 -) ENGINE=MyISAM DEFAULT CHARSET=latin1 + `mytext` longtext character set latin1 collate latin1_general_cs +) ENGINE=MyISAM DEFAULT CHARSET=latin2 drop table t1; CREATE TABLE t1 ( Host varchar(16) binary NOT NULL default '', diff --git a/mysql-test/r/ctype_collate.result b/mysql-test/r/ctype_collate.result index c837d676b6e..8f4ddedbfcf 100644 --- a/mysql-test/r/ctype_collate.result +++ b/mysql-test/r/ctype_collate.result @@ -503,8 +503,8 @@ ALTER TABLE t1 CHARACTER SET latin1 COLLATE latin1_bin; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `latin1_f` char(32) character set latin1 collate latin1_bin default NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 + `latin1_f` char(32) collate latin1_bin default NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_bin SHOW FIELDS FROM t1; Field Type Null Key Default Extra latin1_f char(32) YES NULL diff --git a/mysql-test/t/alter_table.test b/mysql-test/t/alter_table.test index 9235496b45c..658796e4a85 100644 --- a/mysql-test/t/alter_table.test +++ b/mysql-test/t/alter_table.test @@ -214,7 +214,7 @@ select a,hex(a) from t1; show create table t1; alter table t1 DEFAULT CHARACTER SET latin1; show create table t1; -alter table t1 CHARACTER SET latin1; +alter table t1 CONVERT TO CHARACTER SET latin1, DEFAULT CHARACTER SET latin1; show create table t1; alter table t1 DEFAULT CHARACTER SET cp1251; show create table t1; |