After merge fix:
Adjusting SHOW CREATE TABLE output from 5.0 to 5.1 format mysql-test/r/ctype_uca.result: Adjusting SHOW CREATE TABLE output mysql-test/r/ctype_ucs.result: Adjusting SHOW CREATE TABLE output mysql-test/r/ctype_utf8.result: Adjusting SHOW CREATE TABLE output mysql-test/r/func_regexp.result: Adjusting SHOW CREATE TABLE output
This commit is contained in:
parent
d3443ee1c7
commit
1590fa13ff
@ -2763,8 +2763,8 @@ select null, null;
|
|||||||
show create table t1;
|
show create table t1;
|
||||||
Table Create Table
|
Table Create Table
|
||||||
t1 CREATE TABLE `t1` (
|
t1 CREATE TABLE `t1` (
|
||||||
`s1` varchar(64) character set ucs2 collate ucs2_unicode_ci default NULL,
|
`s1` varchar(64) CHARACTER SET ucs2 COLLATE ucs2_unicode_ci DEFAULT NULL,
|
||||||
`s2` varchar(64) character set ucs2 collate ucs2_unicode_ci default NULL
|
`s2` varchar(64) CHARACTER SET ucs2 COLLATE ucs2_unicode_ci DEFAULT NULL
|
||||||
) ENGINE=MyISAM DEFAULT CHARSET=latin1
|
) ENGINE=MyISAM DEFAULT CHARSET=latin1
|
||||||
delete from t1;
|
delete from t1;
|
||||||
insert into t1 values('aaa','aaa');
|
insert into t1 values('aaa','aaa');
|
||||||
|
@ -931,8 +931,8 @@ select null, null;
|
|||||||
show create table t1;
|
show create table t1;
|
||||||
Table Create Table
|
Table Create Table
|
||||||
t1 CREATE TABLE `t1` (
|
t1 CREATE TABLE `t1` (
|
||||||
`s1` varchar(64) character set ucs2 default NULL,
|
`s1` varchar(64) CHARACTER SET ucs2 DEFAULT NULL,
|
||||||
`s2` varchar(64) character set ucs2 default NULL
|
`s2` varchar(64) CHARACTER SET ucs2 DEFAULT NULL
|
||||||
) ENGINE=MyISAM DEFAULT CHARSET=latin1
|
) ENGINE=MyISAM DEFAULT CHARSET=latin1
|
||||||
delete from t1;
|
delete from t1;
|
||||||
insert into t1 values('aaa','aaa');
|
insert into t1 values('aaa','aaa');
|
||||||
|
@ -276,8 +276,8 @@ select null, null;
|
|||||||
show create table t1;
|
show create table t1;
|
||||||
Table Create Table
|
Table Create Table
|
||||||
t1 CREATE TABLE `t1` (
|
t1 CREATE TABLE `t1` (
|
||||||
`s1` varchar(64) character set utf8 default NULL,
|
`s1` varchar(64) CHARACTER SET utf8 DEFAULT NULL,
|
||||||
`s2` varchar(64) character set utf8 default NULL
|
`s2` varchar(64) CHARACTER SET utf8 DEFAULT NULL
|
||||||
) ENGINE=MyISAM DEFAULT CHARSET=latin1
|
) ENGINE=MyISAM DEFAULT CHARSET=latin1
|
||||||
delete from t1;
|
delete from t1;
|
||||||
insert into t1 values('aaa','aaa');
|
insert into t1 values('aaa','aaa');
|
||||||
|
@ -8,8 +8,8 @@ select null, null;
|
|||||||
show create table t1;
|
show create table t1;
|
||||||
Table Create Table
|
Table Create Table
|
||||||
t1 CREATE TABLE `t1` (
|
t1 CREATE TABLE `t1` (
|
||||||
`s1` varchar(64) default NULL,
|
`s1` varchar(64) DEFAULT NULL,
|
||||||
`s2` varchar(64) default NULL
|
`s2` varchar(64) DEFAULT NULL
|
||||||
) ENGINE=MyISAM DEFAULT CHARSET=latin1
|
) ENGINE=MyISAM DEFAULT CHARSET=latin1
|
||||||
delete from t1;
|
delete from t1;
|
||||||
insert into t1 values('aaa','aaa');
|
insert into t1 values('aaa','aaa');
|
||||||
|
Loading…
x
Reference in New Issue
Block a user