Commit f41b7bca authored by unknown's avatar unknown
Browse files

Merge 


mysql-test/r/create.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
sql/sql_table.cc:
  SCCS merged
parents 3baf1c9c f147d73c

mysql-test/r/create.result

+5 −0
Original line number Diff line number Diff line
@@ -586,6 +586,11 @@ DESC t2; 
Field	Type	Null	Key	Default	Extra

f2	varchar(86)	YES		NULL	

DROP TABLE t1,t2;

CREATE TABLE t12913 (f1 ENUM ('a','b')) AS SELECT 'a' AS f1;

SELECT * FROM t12913;

f1

a

DROP TABLE t12913;

create database mysqltest;

use mysqltest;

drop database mysqltest;

mysql-test/t/create.test

+7 −0
Original line number Diff line number Diff line
@@ -494,6 +494,13 @@ AS f2 FROM t1; 
DESC t2;

DROP TABLE t1,t2;



#

# Bug#12913 Simple SQL can crash server or connection

#

CREATE TABLE t12913 (f1 ENUM ('a','b')) AS SELECT 'a' AS f1;

SELECT * FROM t12913;

DROP TABLE t12913;



#

# Bug#11028: Crash on create table like

#

sql/sql_table.cc

+1 −0
Original line number Diff line number Diff line
@@ -678,6 +678,7 @@ int mysql_prepare_table(THD *thd, HA_CREATE_INFO *create_info, 
          if (!(sql_field->flags & NOT_NULL_FLAG))

            null_fields--;

	  sql_field->flags=		dup_field->flags;

          sql_field->interval=          dup_field->interval;

	  it2.remove();			// Remove first (create) definition

	  select_field_pos--;

	  break;