From 5a57e6bb45eb548a961cab2e9ca2f6b45430ffc8 Mon Sep 17 00:00:00 2001
From: Alexander Nozdrin <alik@sun.com>
Date: Sun, 31 Jan 2010 00:08:20 +0300
Subject: [PATCH] Fix Windows build failure (after manual merge from
 5.1-bugteam).

---
 sql/sql_select.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index f8ebc0492a6..5598cc29a01 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -553,7 +553,7 @@ JOIN::prepare(Item ***rref_pointer_array,
         there. Such fields don't contain any data to sort.
       */
       if (!real_order &&
-          (item->type() != Item::Item::FIELD_ITEM ||
+          (item->type() != Item::FIELD_ITEM ||
            ((Item_field *) item)->field->maybe_null() ||
            ((Item_field *) item)->field->sort_length()))
         real_order= TRUE;