Commit fdd6daf4 authored by unknown's avatar unknown
Browse files

BUG#14139 - Merge to 5.0

parent 2f6bb04f

mysql-test/r/create.result

+3 −1
Original line number Diff line number Diff line
@@ -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;

mysql-test/t/create.test

+1 −0
Original line number Diff line number Diff line
@@ -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;

sql/field.h

+4 −1
Original line number Diff line number Diff line
@@ -1373,7 +1373,10 @@ class create_field :public Sql_alloc 
    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

sql/item.h

+1 −0
Original line number Diff line number Diff line
@@ -526,6 +526,7 @@ class Item { 
  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 : "???"; }