diff options
| author | unknown <mhansson/martin@linux-st28.site> | 2007-12-20 14:19:52 +0100 |
|---|---|---|
| committer | unknown <mhansson/martin@linux-st28.site> | 2007-12-20 14:19:52 +0100 |
| commit | fbb25b7cecf468eb4e422e22cd3aa2da4ba0fa8a (patch) | |
| tree | 24684b7fbc4f86b23098e9dab181f05103c2f368 /mysql-test/r/union.result | |
| parent | 666efa1c43344a0b4dbe815e57333647d4d8f2b3 (diff) | |
| parent | a8d1b13f3e9f13efaf96039e51397b2fa67a982f (diff) | |
| download | mariadb-git-fbb25b7cecf468eb4e422e22cd3aa2da4ba0fa8a.tar.gz | |
Merge linux-st28.site:/home/martin/mysql/src/bug32848/my50-bug32848-gca
into linux-st28.site:/home/martin/mysql/src/bug32848/my51-bug32848-gca
mysql-test/r/union.result:
Auto merged
mysql-test/t/union.test:
Auto merged
sql/field.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/field.cc:
Bug#32848: Manual merge
sql/item.cc:
Bug#32848: Manual merge
Diffstat (limited to 'mysql-test/r/union.result')
| -rw-r--r-- | mysql-test/r/union.result | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/mysql-test/r/union.result b/mysql-test/r/union.result index 6fc630ec33c..19306ae5561 100644 --- a/mysql-test/r/union.result +++ b/mysql-test/r/union.result @@ -1445,4 +1445,28 @@ select @var; 1 (select 2) union (select 1 into @var); ERROR 42000: Result consisted of more than one row +CREATE TABLE t1 (a INT); +INSERT INTO t1 VALUES (1), (2), (3); +CREATE TABLE t2 SELECT * FROM (SELECT NULL) a UNION SELECT a FROM t1; +DESC t2; +Field Type Null Key Default Extra +NULL int(11) YES NULL +CREATE TABLE t3 SELECT a FROM t1 UNION SELECT * FROM (SELECT NULL) a; +DESC t3; +Field Type Null Key Default Extra +a int(11) YES NULL +CREATE TABLE t4 SELECT NULL; +DESC t4; +Field Type Null Key Default Extra +NULL binary(0) YES NULL +CREATE TABLE t5 SELECT NULL UNION SELECT NULL; +DESC t5; +Field Type Null Key Default Extra +NULL binary(0) YES NULL +CREATE TABLE t6 +SELECT * FROM (SELECT * FROM (SELECT NULL)a) b UNION SELECT a FROM t1; +DESC t6; +Field Type Null Key Default Extra +NULL int(11) YES NULL +DROP TABLE t1, t2, t3, t4, t5, t6; End of 5.0 tests |