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

Merge bk-internal.mysql.com:/home/bk/mysql-5.1

Browse Source 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
This commit is contained in:
cmiller@zippy.cornsilk.net
2006-11-02 17:51:59 -05:00
parent b2978f9ee8 deb03b93ec
commit b074e13483
206 changed files with 11077 additions and 4883 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
sql/sql_union.cc
View File

@ -694,7 +694,17 @@ bool st_select_lex_unit::change_result(select_subselect *result,
List<Item> *st_select_lex_unit::get_unit_column_types()
{
bool is_union= test(first_select()->next_select());
SELECT_LEX *sl= first_select();
bool is_union= test(sl->next_select());
bool is_procedure= test(sl->join->procedure);
if (is_procedure)
{
/* Types for "SELECT * FROM t1 procedure analyse()"
are generated during execute */
return &sl->join->procedure_fields_list;
}
if (is_union)
{
@ -702,7 +712,8 @@ List<Item> *st_select_lex_unit::get_unit_column_types()
/* Types are generated during prepare */
return &types;
}
return &first_select()->item_list;
return &sl->item_list;
}
bool st_select_lex::cleanup()