database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Manual merged

Browse Source 
mysql-test/r/create.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
This commit is contained in:
unknown
2005-08-31 21:24:25 +04:00
parent 8699f77c08 15bea314cc
commit a1f59825be
3 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -596,6 +596,13 @@ ERROR 42000: Incorrect database name 'xyz'
create table t1(t1.name int); create table t1(t1.name int);
create table t2(test.t2.name int); create table t2(test.t2.name int);
drop table t1,t2; 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; create database mysqltest;
use mysqltest; use mysqltest;
drop database mysqltest; drop database mysqltest;

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

@@ -503,6 +503,15 @@ create table t1(t1.name int);
create table t2(test.t2.name int); create table t2(test.t2.name int);
drop table t1,t2; 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 # Bug#11028: Crash on create table like
# #

2
sql/sql_select.cc
View File

@@ -7953,6 +7953,8 @@ static Field *create_tmp_field_from_item(THD *thd, Item *item, TABLE *table,
item->name, table, item->unsigned_flag); item->name, table, item->unsigned_flag);
break; break;
case STRING_RESULT: case STRING_RESULT:
DBUG_ASSERT(item->collation.collation);
enum enum_field_types type; enum enum_field_types type;
/* /*
DATE/TIME fields have STRING_RESULT result type. To preserve DATE/TIME fields have STRING_RESULT result type. To preserve