4 files changed, 9 insertions, 2 deletions
diff --git a/mysql-test/r/create.result b/mysql-test/r/create.result
index c0c6acd2c70..1f8c6cb464d 100644
--- a/mysql-test/r/create.result
+++ b/mysql-test/r/create.result
@@ -645,10 +645,12 @@ create table t1 (
 a varchar(112) charset utf8 collate utf8_bin not null,
 primary key (a)
 ) select 'test' as a ;
+Warnings:
+Warning	1364	Field 'a' doesn't have a default value
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` varchar(112) character set utf8 collate utf8_bin NOT NULL default '',
+  `a` varchar(112) character set utf8 collate utf8_bin NOT NULL,
   PRIMARY KEY  (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
diff --git a/mysql-test/t/create.test b/mysql-test/t/create.test
index f461a092de1..67ad3058153 100644
--- a/mysql-test/t/create.test
+++ b/mysql-test/t/create.test
@@ -550,6 +550,7 @@ create table t1 (
   a varchar(112) charset utf8 collate utf8_bin not null,
   primary key (a)
 ) select 'test' as a ;
+--warning 1364
 show create table t1;
 drop table t1;
 
diff --git a/sql/field.h b/sql/field.h
index 319316aad15..ed6bf1c0a9c 100644
--- a/sql/field.h
+++ b/sql/field.h
@@ -1373,7 +1373,10 @@ public:
     max number of characters. 
   */
   ulong length;
-  ulong length;
+  /*
+    The value of 'length' before a call to create_length_to_internal_length
+  */
+  uint32 chars_length;
   uint  decimals, flags, pack_length, key_length;
   Field::utype unireg_check;
   TYPELIB *interval;			// Which interval to use
diff --git a/sql/item.h b/sql/item.h
index 5bff285b9f3..2f753564009 100644
--- a/sql/item.h
+++ b/sql/item.h
@@ -526,6 +526,7 @@ public:
   double val_real_from_decimal();
 
   virtual Field *get_tmp_table_field() { return 0; }
+  /* This is also used to create fields in CREATE ... SELECT: */
   virtual Field *tmp_table_field(TABLE *t_arg) { return 0; }
   virtual const char *full_name() const { return name ? name : "???"; }