One more post-review fix.

19b8379a · konstantin@mysql.com · ca6645d8 · 19b8379a
Commit 19b8379a authored May 30, 2005 by konstantin@mysql.com
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

sql/sql_union.cc sql/sql_union.cc +2 -3

No files found.
--- a/sql/sql_union.cc
+++ b/sql/sql_union.cc
@@ -206,8 +206,7 @@ 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,