Commit 15bea314 authored by unknown's avatar unknown
Browse files

manual merge of bug fix#12537 


sql/item.cc:
  Auto merged
sql/sql_select.cc:
  manual merge
parents e6ac9175 033faf72

mysql-test/r/create.result

+7 −0
Original line number Diff line number Diff line
@@ -580,6 +580,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
@@ -492,6 +492,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/item.cc

+4 −2
Original line number Diff line number Diff line
@@ -2047,12 +2047,14 @@ Field *Item::tmp_table_field_from_field_type(TABLE *table) 
  case MYSQL_TYPE_ENUM:

  case MYSQL_TYPE_SET:

  case MYSQL_TYPE_VAR_STRING:

    if (max_length > 255)

    DBUG_ASSERT(collation.collation);

    if (max_length/collation.collation->mbmaxlen > 255)

      break;					// If blob

    return new Field_varstring(max_length, maybe_null, name, table,

			       collation.collation);

  case MYSQL_TYPE_STRING:

    if (max_length > 255)			// If blob

    DBUG_ASSERT(collation.collation);

    if (max_length/collation.collation->mbmaxlen > 255)		// If blob

      break;

    return new Field_string(max_length, maybe_null, name, table,

			    collation.collation);

sql/sql_select.cc

+3 −1
Original line number Diff line number Diff line
@@ -4899,6 +4899,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
@@ -4907,7 +4909,7 @@ static Field* create_tmp_field_from_item(THD *thd, Item *item, TABLE *table, 
    if ((type= item->field_type()) == MYSQL_TYPE_DATETIME ||

        type == MYSQL_TYPE_TIME || type == MYSQL_TYPE_DATE)

      new_field= item->tmp_table_field_from_field_type(table);

    else if (item->max_length > 255)

    else if (item->max_length/item->collation.collation->mbmaxlen > 255)

    {

      if (convert_blob_length)

        new_field= new Field_varstring(convert_blob_length, maybe_null,