diff options
| author | unknown <sanja@montyprogram.com> | 2013-10-29 18:50:36 +0200 |
|---|---|---|
| committer | unknown <sanja@montyprogram.com> | 2013-10-29 18:50:36 +0200 |
| commit | 52dea41052bc1be1efbe59c320046d7e62cfd0a6 (patch) | |
| tree | 515c69dbce80f1af73974286de8f87413b1cad23 /sql/sql_union.cc | |
| parent | 86901216fd4f7eb0844e884203810a0e43fcd103 (diff) | |
| parent | 5ce11d8b4ca2a57968656925a69ed8114d5374f6 (diff) | |
| download | mariadb-git-52dea41052bc1be1efbe59c320046d7e62cfd0a6.tar.gz | |
Merge 5.3->5.5
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 8a5ec26ba80..22b5e5727e8 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(); } |