database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

merged

Browse Source 
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_subselect.h:
  Auto merged
sql/sql_derived.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.h:
  Auto merged
mysql-test/r/subselect.result:
  merging (wiil be fixed after building)
sql/item_subselect.cc:
  merging
sql/sql_select.cc:
  merging
This commit is contained in:
unknown
2003-06-25 23:52:15 +03:00
parent fedda97360 2534f837c1
commit 16aaba7060
350 changed files with 14454 additions and 15810 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_union.cc
View File

@@ -159,7 +159,7 @@ int st_select_lex_unit::prepare(THD *thd, select_result *sel_result,
item_list= select_cursor->item_list;
select_cursor->with_wild= 0;
if (setup_ref_array(thd, &select_cursor->ref_pointer_array,
(item_list.elements + select_cursor->with_sum_func +
(item_list.elements + select_cursor->select_items +
select_cursor->order_list.elements +
select_cursor->group_list.elements)) ||
setup_fields(thd, select_cursor->ref_pointer_array, first_table,
@@ -393,7 +393,7 @@ int st_select_lex_unit::cleanup()
JOIN *join;
if ((join= sl->join))
{
error|= sl->join->cleanup(thd);
error|= sl->join->cleanup();
delete join;
}
}