Moving Item_bool_func::add_key_fields_optimize_op() to Item_bool_func2.

It's now needed outside of Item_bool_func2 any more.

Author: Alexander Barkov

sql/item_cmpfunc.h

@@ -122,10 +122,6 @@ class Arg_comparator: public Sql_alloc
 
 class Item_bool_func :public Item_int_func
 {
-protected:
-  void add_key_fields_optimize_op(JOIN *join, KEY_FIELD **key_fields,
-                                  uint *and_level, table_map usable_tables,
-                                  SARGABLE_PARAM **sargables, bool equal_func);
 public:
   Item_bool_func() :Item_int_func() {}
   Item_bool_func(Item *a) :Item_int_func(a) {}
@@ -291,6 +287,10 @@ class Item_in_optimizer: public Item_bool_func
 class Item_bool_func2 :public Item_bool_func
 {                                              /* Bool with 2 string args */
   bool have_rev_func() const { return rev_functype() != UNKNOWN_FUNC; }
+protected:
+  void add_key_fields_optimize_op(JOIN *join, KEY_FIELD **key_fields,
+                                  uint *and_level, table_map usable_tables,
+                                  SARGABLE_PARAM **sargables, bool equal_func);
 public:
   Item_bool_func2(Item *a,Item *b)
     :Item_bool_func(a,b) { }

sql/sql_select.cc

@@ -4773,11 +4773,11 @@ Item_func_like::add_key_fields(JOIN *join, KEY_FIELD **key_fields,
 
 
 void
-Item_bool_func::add_key_fields_optimize_op(JOIN *join, KEY_FIELD **key_fields,
-                                           uint *and_level,
-                                           table_map usable_tables,
-                                           SARGABLE_PARAM **sargables,
-                                           bool equal_func)
+Item_bool_func2::add_key_fields_optimize_op(JOIN *join, KEY_FIELD **key_fields,
+                                            uint *and_level,
+                                            table_map usable_tables,
+                                            SARGABLE_PARAM **sargables,
+                                            bool equal_func)
 {
   /* If item is of type 'field op field/constant' add it to key_fields */
   if (is_local_field(args[0]))