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

merge 5.5->10.0-base

Browse Source
This commit is contained in:
unknown
2013-10-29 20:53:05 +02:00
parent fef4166990 52dea41052
commit f4d5d849fd
29 changed files with 270 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_union.cc
View File

@ -327,6 +327,7 @@ bool st_select_lex_unit::prepare(THD *thd_arg, select_result *sel_result,
sl->group_list.elements,
can_skip_order_by ?
NULL : sl->order_list.first,
can_skip_order_by,
sl->group_list.first,
sl->having,
(is_union_select ? NULL :
@ -510,7 +511,7 @@ bool st_select_lex_unit::prepare(THD *thd_arg, select_result *sel_result,
0, 0,
global_parameters->order_list.elements, // og_num
global_parameters->order_list.first, // order
NULL, NULL, NULL,
false, NULL, NULL, NULL,
fake_select_lex, this);
fake_select_lex->table_list.empty();
}