summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <evgen@moonbone.local>2005-08-30 23:29:47 +0400
committerunknown <evgen@moonbone.local>2005-08-30 23:29:47 +0400
commit15bea314cc686f9ed9813cf8e056831cea9f121e (patch)
tree2eec44168d9216c78f967e51c6830acdd67025a6 /mysql-test
parente6ac9175d13091b8bd7661b5e8ae8d3add81fbb0 (diff)
parent033faf7256604c5ba2edec8ddc846f663488cd16 (diff)
downloadmariadb-git-15bea314cc686f9ed9813cf8e056831cea9f121e.tar.gz
manual merge of bug fix#12537
sql/item.cc: Auto merged sql/sql_select.cc: manual merge
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/create.result7
-rw-r--r--mysql-test/t/create.test9
2 files changed, 16 insertions, 0 deletions
diff --git a/mysql-test/r/create.result b/mysql-test/r/create.result
index 00bc0320028..95757fbd7dc 100644
--- a/mysql-test/r/create.result
+++ b/mysql-test/r/create.result
@@ -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;
diff --git a/mysql-test/t/create.test b/mysql-test/t/create.test
index 3b4b86a3df3..55321a81f5e 100644
--- a/mysql-test/t/create.test
+++ b/mysql-test/t/create.test
@@ -493,6 +493,15 @@ 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
#
create database mysqltest;