From 19b8379af6d35ea6c0767b8ed05ebc49339bd7be Mon Sep 17 00:00:00 2001
From: "konstantin@mysql.com" <>
Date: Mon, 30 May 2005 21:49:59 +0400
Subject: [PATCH] One more post-review fix.

---
 sql/sql_union.cc | 5 ++---
 1 file 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,