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

Merge neptunus.(none):/home/msvensson/mysql/bug17039/my50-bug17039

Browse Source 
into  neptunus.(none):/home/msvensson/mysql/bug17039/my51-bug17039


sql/sql_union.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
This commit is contained in:
unknown
2006-10-18 22:58:04 +02:00
parent 2bffa05594 7f713ab402
commit 6b6deee80a
2 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
sql/sql_union.cc
View File

@@ -689,7 +689,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)
{
@@ -697,7 +707,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()