diff options
| author | unknown <sanja@montyprogram.com> | 2013-10-29 20:53:05 +0200 |
|---|---|---|
| committer | unknown <sanja@montyprogram.com> | 2013-10-29 20:53:05 +0200 |
| commit | f4d5d849fd3b526d38ca6eb083fd0b290eb0eda7 (patch) | |
| tree | bf55c043320485e4ce5c8be90c8d619b481a0306 /sql/sql_union.cc | |
| parent | fef416699009b78366d9eec937c01822b531f518 (diff) | |
| parent | 52dea41052bc1be1efbe59c320046d7e62cfd0a6 (diff) | |
| download | mariadb-git-f4d5d849fd3b526d38ca6eb083fd0b290eb0eda7.tar.gz | |
merge 5.5->10.0-base
Diffstat (limited to 'sql/sql_union.cc')
| -rw-r--r-- | sql/sql_union.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc index cf7fd4f8280..864f5a8d91a 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -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(); } |