Commit f76ff565 authored by unknown's avatar unknown
Browse files

BUG#14480: post-fix: use the default field value from CREATE list too.

parent 224e8553

mysql-test/r/create.result

+11 −0
Original line number Diff line number Diff line
@@ -697,4 +697,15 @@ 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 ;

drop table t2;

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

select a1,a2 from t1;

show create table t2;

Table	Create Table

t2	CREATE TABLE `t2` (

  `a` int(11) default '3',

  `b` int(11) default '3',

  `a1` int(11) default NULL,

  `a2` int(11) default NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1

drop table t1, t2;

mysql-test/t/create.test

+7 −0
Original line number Diff line number Diff line
@@ -594,6 +594,13 @@ create table t2 ( 
  primary key (a1)

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



# Test the default value

drop table t2;



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

  select a1,a2 from t1;

show create table t2;



drop table t1, t2;



# End of 4.1 tests

sql/sql_table.cc

+1 −0
Original line number Diff line number Diff line
@@ -639,6 +639,7 @@ int mysql_prepare_table(THD *thd, HA_CREATE_INFO *create_info, 
	else

	{

	  /* Field redefined */

	  sql_field->def=		dup_field->def;

	  sql_field->sql_type=		dup_field->sql_type;

	  sql_field->charset=		(dup_field->charset ?

					 dup_field->charset :