Commit a1f59825 authored by unknown's avatar unknown
Browse files

Manual merged 


mysql-test/r/create.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
parents 8699f77c 15bea314

mysql-test/r/create.result

+7 −0
Original line number Diff line number Diff line
@@ -596,6 +596,13 @@ ERROR 42000: Incorrect database name 'xyz' 
create table t1(t1.name int);

create table t2(test.t2.name int);

drop table t1,t2;

CREATE TABLE t1 (f1 VARCHAR(255) CHARACTER SET utf8);

CREATE TABLE t2 AS SELECT LEFT(f1,86) AS f2 FROM t1 UNION SELECT LEFT(f1,86)

AS f2 FROM t1;

DESC t2;

Field	Type	Null	Key	Default	Extra

f2	varchar(86)	YES		NULL	

DROP TABLE t1,t2;

create database mysqltest;

use mysqltest;

drop database mysqltest;

mysql-test/t/create.test

+9 −0
Original line number Diff line number Diff line
@@ -503,6 +503,15 @@ create table t1(t1.name int); 
create table t2(test.t2.name int);

drop table t1,t2;



#

# Bug #12537: UNION produces longtext instead of varchar

#

CREATE TABLE t1 (f1 VARCHAR(255) CHARACTER SET utf8);

CREATE TABLE t2 AS SELECT LEFT(f1,86) AS f2 FROM t1 UNION SELECT LEFT(f1,86)

AS f2 FROM t1;

DESC t2;

DROP TABLE t1,t2;



#

# Bug#11028: Crash on create table like

#

sql/sql_select.cc

+2 −0
Original line number Diff line number Diff line
@@ -7953,6 +7953,8 @@ static Field *create_tmp_field_from_item(THD *thd, Item *item, TABLE *table, 
				   item->name, table, item->unsigned_flag);

    break;

  case STRING_RESULT:

    DBUG_ASSERT(item->collation.collation);

  

    enum enum_field_types type;

    /*

      DATE/TIME fields have STRING_RESULT result type. To preserve