Commit 18b488d7 authored by unknown's avatar unknown
Browse files

BUG#14480 post-fix: merge to 5.0

parent 2d107c0c

mysql-test/r/create.result

+17 −5
Original line number Diff line number Diff line
@@ -662,11 +662,14 @@ create table t1 ( 
a varchar(12) charset utf8 collate utf8_bin not null, 

b int not null, primary key (a)

) select a, 1 as b from t2 ;

Warnings:

Warning	1364	Field 'a' doesn't have a default value

Warning	1364	Field 'b' doesn't have a default value

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `a` varchar(12) character set utf8 collate utf8_bin NOT NULL default '',

  `b` int(11) NOT NULL default '0',

  `a` varchar(12) character set utf8 collate utf8_bin NOT NULL,

  `b` int(11) NOT NULL,

  PRIMARY KEY  (`a`)

) ENGINE=MyISAM DEFAULT CHARSET=latin1

drop table t1;
@@ -674,11 +677,14 @@ create table t1 ( 
a varchar(12) charset utf8 collate utf8_bin not null,

b int not null, primary key (a)

) select 'a' as a , 1 as b from t2 ;

Warnings:

Warning	1364	Field 'a' doesn't have a default value

Warning	1364	Field 'b' doesn't have a default value

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `a` varchar(12) character set utf8 collate utf8_bin NOT NULL default '',

  `b` int(11) NOT NULL default '0',

  `a` varchar(12) character set utf8 collate utf8_bin NOT NULL,

  `b` int(11) NOT NULL,

  PRIMARY KEY  (`a`)

) ENGINE=MyISAM DEFAULT CHARSET=latin1

drop table t1;
@@ -686,11 +692,13 @@ create table t1 ( 
a varchar(12) charset utf8 collate utf8_bin,

b int not null, primary key (a)

) select 'a' as a , 1 as b from t2 ;

Warnings:

Warning	1364	Field 'b' doesn't have a default value

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `a` varchar(12) character set utf8 collate utf8_bin NOT NULL default '',

  `b` int(11) NOT NULL default '0',

  `b` int(11) NOT NULL,

  PRIMARY KEY  (`a`)

) ENGINE=MyISAM DEFAULT CHARSET=latin1

drop table t1, t2;
@@ -704,6 +712,8 @@ a1 varchar(12) charset utf8 collate utf8_bin not null, 
a2 int, a3 int, a4 int, a5 int, a6 int, a7 int, a8 int, a9 int,

primary key (a1)

) select a1,a2,a3,a4,a5,a6,a7,a8,a9 from t1 ;

Warnings:

Warning	1364	Field 'a1' doesn't have a default value

drop table t2;

create table t2 ( 

a1 varchar(12) charset utf8 collate utf8_bin,
@@ -719,6 +729,8 @@ a1 varchar(12) charset utf8 collate utf8_bin not null, 
a2 int, a3 int, a4 int, a5 int, a6 int, a7 int, a8 int, a9 int,

primary key (a1)

) select a1,a2,a3,a4,a5,a6,a7,a8,a9 from t1 ;

Warnings:

Warning	1364	Field 'a1' doesn't have a default value

drop table t2;

create table t2 ( a int default 3, b int default 3)

select a1,a2 from t1;

mysql-test/t/create.test

+7 −0
Original line number Diff line number Diff line
@@ -563,6 +563,7 @@ CREATE TABLE t2 ( 
);

insert into t2 values(111);



--warning 1364

create table t1 ( 

  a varchar(12) charset utf8 collate utf8_bin not null, 

  b int not null, primary key (a)
@@ -570,6 +571,7 @@ create table t1 ( 
show create table t1;

drop table t1;



--warning 1364

create table t1 ( 

  a varchar(12) charset utf8 collate utf8_bin not null,

  b int not null, primary key (a)
@@ -577,6 +579,7 @@ create table t1 ( 
show create table t1;

drop table t1;



--warning 1364

create table t1 ( 

  a varchar(12) charset utf8 collate utf8_bin,

  b int not null, primary key (a)
@@ -590,6 +593,7 @@ create table t1 ( 
);

insert into t1 values (1,1,1, 1,1,1, 1,1,1);



--warning 1364

create table t2 ( 

  a1 varchar(12) charset utf8 collate utf8_bin not null,

  a2 int, a3 int, a4 int, a5 int, a6 int, a7 int, a8 int, a9 int,
@@ -597,17 +601,20 @@ create table t2 ( 
) select a1,a2,a3,a4,a5,a6,a7,a8,a9 from t1 ;

drop table t2;



--warning 1364

create table t2 ( 

  a1 varchar(12) charset utf8 collate utf8_bin,

  a2 int, a3 int, a4 int, a5 int, a6 int, a7 int, a8 int, a9 int

) select a1,a2,a3,a4,a5,a6,a7,a8,a9 from t1;



drop table t1, t2;

--warning 1364

create table t1 ( 

  a1 int, a2 int, a3 int, a4 int, a5 int, a6 int, a7 int, a8 int, a9 int

);

insert into t1 values (1,1,1, 1,1,1, 1,1,1);



--warning 1364

create table t2 ( 

  a1 varchar(12) charset utf8 collate utf8_bin not null,

  a2 int, a3 int, a4 int, a5 int, a6 int, a7 int, a8 int, a9 int,