after review fix(CRUM)

after merge fix


sql/item.cc:
  after merge fix
sql/item_cmpfunc.cc:
  after review fix
sql/item_cmpfunc.h:
  after review fix

1 files changed, 2 insertions, 3 deletions

diff --git a/sql/item_cmpfunc.h b/sql/item_cmpfunc.h
index ca03d02aa77..74c9dec7ef8 100644
--- a/sql/item_cmpfunc.h
+++ b/sql/item_cmpfunc.h
@@ -34,9 +34,8 @@ class Item_bool_func2 :public Item_int_func
 {						/* Bool with 2 string args */
 protected:
   String tmp_value1,tmp_value2;
-  bool equal;
 public:
-  Item_bool_func2(Item *a,Item *b) :Item_int_func(a,b), equal(0) {}
+  Item_bool_func2(Item *a,Item *b) :Item_int_func(a,b) {}
   void fix_length_and_dec();
   void set_cmp_func()
   {
@@ -89,7 +88,7 @@ public:
 class Item_func_equal :public Item_bool_rowready_func2
 {
 public:
-  Item_func_equal(Item *a,Item *b) :Item_bool_rowready_func2(a,b) { equal=1; };
+  Item_func_equal(Item *a,Item *b) :Item_bool_rowready_func2(a,b) {};
   longlong val_int();
   void fix_length_and_dec();
   enum Functype functype() const { return EQUAL_FUNC; }