diff options
| author | konstantin@mysql.com <> | 2005-05-30 21:49:59 +0400 |
|---|---|---|
| committer | konstantin@mysql.com <> | 2005-05-30 21:49:59 +0400 |
| commit | 19b8379af6d35ea6c0767b8ed05ebc49339bd7be (patch) | |
| tree | 294f25a02cc4634b1757e8b221a8e1e611f66a06 /sql/sql_union.cc | |
| parent | ca6645d852d716f26a46716f44dd7bd6e9bba1e2 (diff) | |
| download | mariadb-git-19b8379af6d35ea6c0767b8ed05ebc49339bd7be.tar.gz | |
One more post-review fix.
Diffstat (limited to 'sql/sql_union.cc')
| -rw-r--r-- | sql/sql_union.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc index 21549f76350..8d36889df76 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -206,9 +206,8 @@ bool st_select_lex_unit::prepare(THD *thd_arg, select_result *sel_result, thd_arg->lex->current_select= sl; - can_skip_order_by= is_union && - (!sl->braces || sl->select_limit == HA_POS_ERROR); - + can_skip_order_by= is_union && !(sl->braces && sl->explicit_limit); + res= join->prepare(&sl->ref_pointer_array, (TABLE_LIST*) sl->table_list.first, sl->with_wild, sl->where, |