database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Fix for a bug with empty item list in UNION's

Browse Source
This commit is contained in:
unknown
2003-04-08 15:55:28 +03:00
parent eaa27ad448
commit f4216c526b
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/union.result
View File

@ -273,3 +273,5 @@ SELECT @a:=1 UNION SELECT @a:=@a+1;
@a:=1 @a:=1
1 1
2 2
(SELECT 1) UNION (SELECT 2) ORDER BY (SELECT a);
Unknown column 'a' in 'field list'

2
mysql-test/t/union.test
View File

@ -146,3 +146,5 @@ drop table t1,t2;
(select 1) union (select 2) order by 0; (select 1) union (select 2) order by 0;
SELECT @a:=1 UNION SELECT @a:=@a+1; SELECT @a:=1 UNION SELECT @a:=@a+1;
--error 1054
(SELECT 1) UNION (SELECT 2) ORDER BY (SELECT a);

7
sql/item.cc
View File

@ -701,9 +701,10 @@ bool Item_field::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref)
(last= sl)->get_table_list(), &where, (last= sl)->get_table_list(), &where,
0)) != not_found_field) 0)) != not_found_field)
break; break;
if ((refer= find_item_in_list(this, sl->item_list, &counter, if (sl->item_list.elements &&
REPORT_EXCEPT_NOT_FOUND)) != ((refer= find_item_in_list(this, sl->item_list, &counter,
(Item **)not_found_item) REPORT_EXCEPT_NOT_FOUND)) !=
(Item **)not_found_item))
break; break;
if (sl->master_unit()->first_select()->linkage == if (sl->master_unit()->first_select()->linkage ==
DERIVED_TABLE_TYPE) DERIVED_TABLE_TYPE)