mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 20:42:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

manual merge of bug fix#12537

Browse source 
sql/item.cc:
  Auto merged
sql/sql_select.cc:
  manual merge
This commit is contained in:
unknown 2005-08-30 23:29:47 +04:00
commit 15bea314cc
4 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
mysql-test/r/create.result
View file

@ -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;

9
mysql-test/t/create.test
View file

@ -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
#

6
sql/item.cc
View file

@ -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);

4
sql/sql_select.cc
View file

@ -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,