From 35e5925673af86c1ccd61ef22af3b462c62cb5af Mon Sep 17 00:00:00 2001
From: "evgen@moonbone.local" <>
Date: Thu, 8 Mar 2007 19:38:21 +0300
Subject: [PATCH] sql_select.cc:   Postfix for bug#22331.

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

diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 06352d48154..9fe92d63da3 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -7621,7 +7621,8 @@ static COND* substitute_for_best_equal_field(COND *cond,
           break;
       }
     }
-    if (!((Item_cond*)cond)->argument_list()->elements)
+    if (cond->type() == Item::COND_ITEM &&
+        !((Item_cond*)cond)->argument_list()->elements)
       cond= new Item_int((int32)cond->val_bool());
 
   }