MDEV-26285 Refactor spider_db_mbase_util::open_item_func()bb-10.7-mdev-26285

spider_db_mbase_util::open_item_func() is a monster function.
It is difficult to maintain while it is expected that we need to
modify it when a new SQL function or a new func_type is added.

I split the function into two distinct functions: one handles the
case of str != NULL and the other handles the case of str == NULL.

This refactoring was done in a conservative way because we do not
have comprehensive tests on the function.

2 files changed, 491 insertions, 606 deletions

diff --git a/storage/spider/spd_db_mysql.cc b/storage/spider/spd_db_mysql.cc
index 10b4fb7cee4..5a3e36ff537 100644
--- a/storage/spider/spd_db_mysql.cc
+++ b/storage/spider/spd_db_mysql.cc
@@ -5787,6 +5787,13 @@ int spider_db_mbase_util::append_unlock_table(
   DBUG_RETURN(0);
 }
 
+/**
+  The function check if the given item_func and its arguments can be pushed
+  down to a data node. If so and str != NULL, the function also print, to str,
+  the string corresponding to the item_func.
+
+  @return 0: success, otherwise: error
+ */
 int spider_db_mbase_util::open_item_func(
   Item_func *item_func,
   ha_spider *spider,
@@ -5796,6 +5803,171 @@ int spider_db_mbase_util::open_item_func(
   bool use_fields,
   spider_fields *fields
 ) {
+  DBUG_ENTER("spider_db_mbase_util::check_item_func");
+
+  int error = check_item_func(item_func, spider, alias,
+    alias_length, use_fields, fields);
+  if (error)
+    DBUG_RETURN(error);
+  if (!str)
+    DBUG_RETURN(0);
+
+  DBUG_RETURN(print_item_func(item_func, spider, str, alias,
+    alias_length, use_fields, fields));
+}
+
+namespace {
+  bool item_func_is_timestampdiff(
+    const char *func_name,
+    int func_name_length
+  ) {
+    return func_name_length == 13 &&
+      !strncasecmp("timestampdiff", func_name, func_name_length);
+  }
+
+  bool not_func_should_be_skipped(
+    Item_func *item_func
+  ){
+    DBUG_ENTER("not_func_should_be_skipped");
+    Item **item_list = item_func->arguments();
+
+    if (item_list[0]->type() == Item::COND_ITEM)
+    {
+      DBUG_PRINT("info",("spider item_list[0] is COND_ITEM"));
+      Item_cond *item_cond = (Item_cond *) item_list[0];
+      if (item_cond->functype() == Item_func::COND_AND_FUNC)
+      {
+        DBUG_PRINT("info",("spider item_cond is COND_AND_FUNC"));
+        List_iterator_fast<Item> lif(*(item_cond->argument_list()));
+        bool has_expr_cache_item = FALSE;
+        bool has_isnotnull_func = FALSE;
+        bool has_other_item = FALSE;
+        while(Item *item = lif++)
+        {
+          if (
+            item->type() == Item::EXPR_CACHE_ITEM
+          ) {
+            DBUG_PRINT("info",("spider EXPR_CACHE_ITEM"));
+            has_expr_cache_item = TRUE;
+          } else
+          if (
+            item->type() == Item::FUNC_ITEM &&
+            ((Item_func *) item)->functype() == Item_func::ISNOTNULL_FUNC
+          ) {
+            DBUG_PRINT("info",("spider ISNOTNULL_FUNC"));
+            has_isnotnull_func = TRUE;
+          } else {
+            DBUG_PRINT("info",("spider has other item"));
+            DBUG_PRINT("info",("spider COND type=%d", item->type()));
+            has_other_item = TRUE;
+          }
+        }
+        if (has_expr_cache_item && has_isnotnull_func && !has_other_item)
+        {
+          DBUG_PRINT("info",("spider NOT EXISTS skip"));
+          DBUG_RETURN(TRUE);
+        }
+      }
+    }
+    DBUG_RETURN(FALSE);
+  }
+}
+
+/**
+  Check if the given item_func and its arguments can be pushed down to
+  a data node. This function is recursive because we need to also check
+  the arguments of the item_func.
+
+  @return 0: success, otherwise: error
+ */
+int spider_db_mbase_util::check_item_func(
+  Item_func *item_func,
+  ha_spider *spider,
+  const char *alias,
+  uint alias_length,
+  bool use_fields,
+  spider_fields *fields
+) {
+  DBUG_ENTER("spider_db_mbase_util::check_item_func");
+
+  Item_func::Functype func_type = item_func->functype();
+  DBUG_PRINT("info",("spider functype = %d", func_type));
+
+  LEX_CSTRING orig_func_name = item_func->func_name_cstring();
+  const char *func_name = orig_func_name.str;
+  int func_name_length = orig_func_name.length;
+  DBUG_PRINT("info",("spider func_name = %s", func_name));
+
+  /* The blacklist of the functions that cannot be pushed down */
+  if (
+    func_type == Item_func::TRIG_COND_FUNC ||
+    func_type == Item_func::CASE_SEARCHED_FUNC ||
+    func_type == Item_func::CASE_SIMPLE_FUNC
+  ) {
+    DBUG_RETURN(ER_SPIDER_COND_SKIP_NUM);
+  }
+
+  if (func_type == Item_func::NOT_FUNC)
+  {
+    /* Why the following check is necessary? */
+    if(not_func_should_be_skipped(item_func))
+      DBUG_RETURN(ER_SPIDER_COND_SKIP_NUM);
+  }
+
+  if (func_type == Item_func::UDF_FUNC)
+  {
+    int use_pushdown_udf = spider_param_use_pushdown_udf(
+      spider->wide_handler->trx->thd, spider->share->use_pushdown_udf);
+    if (!use_pushdown_udf) {
+        DBUG_RETURN(ER_SPIDER_COND_SKIP_NUM);
+    }
+  }
+
+  if (func_type == Item_func::FT_FUNC) {
+    if (spider_db_check_ft_idx(item_func, spider) == MAX_KEY)
+      DBUG_RETURN(ER_SPIDER_COND_SKIP_NUM);
+  }
+
+  if (func_type == Item_func::UNKNOWN_FUNC)
+  {
+    if (item_func_is_timestampdiff(func_name, func_name_length)) {
+      DBUG_RETURN(ER_SPIDER_COND_SKIP_NUM);
+    }
+  }
+  /* End of the blacklist */
+
+  /* Check the arguments recursively */
+  if (uint item_count = item_func->argument_count())
+  {
+    Item **item_list = item_func->arguments();
+    for (uint roop_count = 0; roop_count < item_count; roop_count++)
+    {
+      Item *item = item_list[roop_count];
+      if (int error_num = spider_db_print_item_type(item, NULL, spider, NULL,
+        alias, alias_length, dbton_id, use_fields, fields))
+        DBUG_RETURN(error_num);
+    }
+  }
+
+  DBUG_RETURN(0);
+}
+
+/**
+  The function print the string corresponding to the given item_func to str.
+  The function is assumed to be called only when the check by the function
+  check_item_func() has passed.
+
+  @return 0: success, otherwise: error
+ */
+int spider_db_mbase_util::print_item_func(
+  Item_func *item_func,
+  ha_spider *spider,
+  spider_string *str,
+  const char *alias,
+  uint alias_length,
+  bool use_fields,
+  spider_fields *fields
+) {
   int error_num;
   Item *item, **item_list = item_func->arguments();
   Field *field;
@@ -5810,13 +5982,14 @@ int spider_db_mbase_util::open_item_func(
     last_str_length = SPIDER_SQL_NULL_CHAR_LEN;
   int use_pushdown_udf;
   bool merge_func = FALSE;
-  DBUG_ENTER("spider_db_mbase_util::open_item_func");
-  if (str)
-  {
-    if (str->reserve(SPIDER_SQL_OPEN_PAREN_LEN))
-      DBUG_RETURN(HA_ERR_OUT_OF_MEM);
-    str->q_append(SPIDER_SQL_OPEN_PAREN_STR, SPIDER_SQL_OPEN_PAREN_LEN);
-  }
+  DBUG_ENTER("spider_db_mbase_util::print_item_func");
+  DBUG_ASSERT(!check_item_func(item_func, spider, alias, alias_length,
+    use_fields, fields) && str);
+
+  if (str->reserve(SPIDER_SQL_OPEN_PAREN_LEN))
+    DBUG_RETURN(HA_ERR_OUT_OF_MEM);
+  str->q_append(SPIDER_SQL_OPEN_PAREN_STR, SPIDER_SQL_OPEN_PAREN_LEN);
+
   DBUG_PRINT("info",("spider functype = %d", item_func->functype()));
   switch (item_func->functype())
   {
@@ -5865,14 +6038,9 @@ int spider_db_mbase_util::open_item_func(
       {
         if (
           !strncasecmp("rand", func_name, func_name_length) &&
-#ifdef SPIDER_Item_args_arg_count_IS_PROTECTED
           !item_func->argument_count()
-#else
-          !item_func->arg_count
-#endif
         ) {
-          if (str)
-            str->length(str->length() - SPIDER_SQL_OPEN_PAREN_LEN);
+          str->length(str->length() - SPIDER_SQL_OPEN_PAREN_LEN);
           DBUG_RETURN(spider_db_open_item_int(item_func, NULL, spider, str,
             alias, alias_length, dbton_id, use_fields, fields));
         } else if (
@@ -5882,38 +6050,36 @@ int spider_db_mbase_util::open_item_func(
           /* item_count == 1 means this TRIM() is without a remove_str */
           item = item_list[0];
           Item *item_tmp = item_list[1];
-          if (str) 
+
+          if (item_tmp->is_of_type(Item::CONST_ITEM, STRING_RESULT))
           {
-            if (item_tmp->is_of_type(Item::CONST_ITEM, STRING_RESULT))
-            {
-              /* 1. append 'TRIM(BOTH ' */
-              if (str->reserve(SPIDER_SQL_TRIM_LEN + SPIDER_SQL_OPEN_PAREN_LEN +
-                               SPIDER_SQL_TRIM_BOTH_LEN))
-                DBUG_RETURN(HA_ERR_OUT_OF_MEM);
-              str->q_append(SPIDER_SQL_TRIM_STR, SPIDER_SQL_TRIM_LEN);
-              str->q_append(SPIDER_SQL_OPEN_PAREN_STR,
-                            SPIDER_SQL_OPEN_PAREN_LEN);
-              str->q_append(SPIDER_SQL_TRIM_BOTH_STR, SPIDER_SQL_TRIM_BOTH_LEN);
-              /* 2. append "remove_str"*/
-              if ((error_num = spider_db_print_item_type(
-                      item_tmp, NULL, spider, str, alias, alias_length, dbton_id,
-                      use_fields, fields)))
-                DBUG_RETURN(error_num);
-              /* 3. append ' FROM ' */
-              if (str->reserve(SPIDER_SQL_FROM_LEN))
-                DBUG_RETURN(HA_ERR_OUT_OF_MEM);
-              str->q_append(SPIDER_SQL_FROM_STR, SPIDER_SQL_FROM_LEN);
-              /* 4. append `field` */
-              if ((error_num = spider_db_print_item_type(
-                      item, NULL, spider, str, alias, alias_length, dbton_id,
-                      use_fields, fields)))
-                DBUG_RETURN(error_num);
-              /* 5. append ')' */
-              if (str->reserve(SPIDER_SQL_CLOSE_PAREN_LEN))
-                DBUG_RETURN(HA_ERR_OUT_OF_MEM);
-              str->q_append(SPIDER_SQL_CLOSE_PAREN_STR,
-                            SPIDER_SQL_CLOSE_PAREN_LEN);
-            }
+            /* 1. append 'TRIM(BOTH ' */
+            if (str->reserve(SPIDER_SQL_TRIM_LEN + SPIDER_SQL_OPEN_PAREN_LEN +
+                              SPIDER_SQL_TRIM_BOTH_LEN))
+              DBUG_RETURN(HA_ERR_OUT_OF_MEM);
+            str->q_append(SPIDER_SQL_TRIM_STR, SPIDER_SQL_TRIM_LEN);
+            str->q_append(SPIDER_SQL_OPEN_PAREN_STR,
+                          SPIDER_SQL_OPEN_PAREN_LEN);
+            str->q_append(SPIDER_SQL_TRIM_BOTH_STR, SPIDER_SQL_TRIM_BOTH_LEN);
+            /* 2. append "remove_str"*/
+            if ((error_num = spider_db_print_item_type(
+                    item_tmp, NULL, spider, str, alias, alias_length, dbton_id,
+                    use_fields, fields)))
+              DBUG_RETURN(error_num);
+            /* 3. append ' FROM ' */
+            if (str->reserve(SPIDER_SQL_FROM_LEN))
+              DBUG_RETURN(HA_ERR_OUT_OF_MEM);
+            str->q_append(SPIDER_SQL_FROM_STR, SPIDER_SQL_FROM_LEN);
+            /* 4. append `field` */
+            if ((error_num = spider_db_print_item_type(
+                    item, NULL, spider, str, alias, alias_length, dbton_id,
+                    use_fields, fields)))
+              DBUG_RETURN(error_num);
+            /* 5. append ')' */
+            if (str->reserve(SPIDER_SQL_CLOSE_PAREN_LEN))
+              DBUG_RETURN(HA_ERR_OUT_OF_MEM);
+            str->q_append(SPIDER_SQL_CLOSE_PAREN_STR,
+                          SPIDER_SQL_CLOSE_PAREN_LEN);
           }
           item_count -= 2;
           break;
@@ -5929,50 +6095,47 @@ int spider_db_mbase_util::open_item_func(
           /* item_count == 2 means this TRIM(LEADING/TRAILING ...) is with a remove_str */
           item = item_list[0];
           Item *item_tmp = item_list[1];
-          if (str) 
+          if (item_tmp->is_of_type(Item::CONST_ITEM, STRING_RESULT))
           {
-            if (item_tmp->is_of_type(Item::CONST_ITEM, STRING_RESULT))
-            {
-              /* 1. append 'TRIM(LEADING ' or 'TRIM(TRAILING ' */
-              if (func_name[0] == 'l' || func_name[0] == 'L')
-              { /* ltrim */
-                if (str->reserve(SPIDER_SQL_TRIM_LEN + SPIDER_SQL_OPEN_PAREN_LEN +
-                                 SPIDER_SQL_TRIM_LEADING_LEN))
-                  DBUG_RETURN(HA_ERR_OUT_OF_MEM);
-                str->q_append(SPIDER_SQL_TRIM_STR, SPIDER_SQL_TRIM_LEN);
-                str->q_append(SPIDER_SQL_OPEN_PAREN_STR,
-                              SPIDER_SQL_OPEN_PAREN_LEN);
-                str->q_append(SPIDER_SQL_TRIM_LEADING_STR, SPIDER_SQL_TRIM_LEADING_LEN);
-              } else 
-              { /* rtrim */
-                if (str->reserve(SPIDER_SQL_TRIM_LEN + SPIDER_SQL_OPEN_PAREN_LEN +
-                                 SPIDER_SQL_TRIM_TRAILING_LEN))
-                  DBUG_RETURN(HA_ERR_OUT_OF_MEM);
-                str->q_append(SPIDER_SQL_TRIM_STR, SPIDER_SQL_TRIM_LEN);
-                str->q_append(SPIDER_SQL_OPEN_PAREN_STR,
-                              SPIDER_SQL_OPEN_PAREN_LEN);
-                str->q_append(SPIDER_SQL_TRIM_TRAILING_STR, SPIDER_SQL_TRIM_TRAILING_LEN);
-              }
-              /* 2. append "remove_str"*/
-              if ((error_num = spider_db_print_item_type(
-                  item_tmp, NULL, spider, str, alias, alias_length, dbton_id,
-                  use_fields, fields)))
-                DBUG_RETURN(error_num);
-              /* 3. append ' FROM ' */
-              if (str->reserve(SPIDER_SQL_FROM_LEN))
+            /* 1. append 'TRIM(LEADING ' or 'TRIM(TRAILING ' */
+            if (func_name[0] == 'l' || func_name[0] == 'L')
+            { /* ltrim */
+              if (str->reserve(SPIDER_SQL_TRIM_LEN + SPIDER_SQL_OPEN_PAREN_LEN +
+                                SPIDER_SQL_TRIM_LEADING_LEN))
                 DBUG_RETURN(HA_ERR_OUT_OF_MEM);
-              str->q_append(SPIDER_SQL_FROM_STR, SPIDER_SQL_FROM_LEN);
-              /* 4. append `field` */
-              if ((error_num = spider_db_print_item_type(
-                  item, NULL, spider, str, alias, alias_length, dbton_id,
-                  use_fields, fields)))
-                DBUG_RETURN(error_num);
-              /* 5. append ')' */
-              if (str->reserve(SPIDER_SQL_CLOSE_PAREN_LEN))
+              str->q_append(SPIDER_SQL_TRIM_STR, SPIDER_SQL_TRIM_LEN);
+              str->q_append(SPIDER_SQL_OPEN_PAREN_STR,
+                            SPIDER_SQL_OPEN_PAREN_LEN);
+              str->q_append(SPIDER_SQL_TRIM_LEADING_STR, SPIDER_SQL_TRIM_LEADING_LEN);
+            } else
+            { /* rtrim */
+              if (str->reserve(SPIDER_SQL_TRIM_LEN + SPIDER_SQL_OPEN_PAREN_LEN +
+                                SPIDER_SQL_TRIM_TRAILING_LEN))
                 DBUG_RETURN(HA_ERR_OUT_OF_MEM);
-              str->q_append(SPIDER_SQL_CLOSE_PAREN_STR,
-                            SPIDER_SQL_CLOSE_PAREN_LEN);
+              str->q_append(SPIDER_SQL_TRIM_STR, SPIDER_SQL_TRIM_LEN);
+              str->q_append(SPIDER_SQL_OPEN_PAREN_STR,
+                            SPIDER_SQL_OPEN_PAREN_LEN);
+              str->q_append(SPIDER_SQL_TRIM_TRAILING_STR, SPIDER_SQL_TRIM_TRAILING_LEN);
             }
+            /* 2. append "remove_str"*/
+            if ((error_num = spider_db_print_item_type(
+                item_tmp, NULL, spider, str, alias, alias_length, dbton_id,
+                use_fields, fields)))
+              DBUG_RETURN(error_num);
+            /* 3. append ' FROM ' */
+            if (str->reserve(SPIDER_SQL_FROM_LEN))
+              DBUG_RETURN(HA_ERR_OUT_OF_MEM);
+            str->q_append(SPIDER_SQL_FROM_STR, SPIDER_SQL_FROM_LEN);
+            /* 4. append `field` */
+            if ((error_num = spider_db_print_item_type(
+                item, NULL, spider, str, alias, alias_length, dbton_id,
+                use_fields, fields)))
+              DBUG_RETURN(error_num);
+            /* 5. append ')' */
+            if (str->reserve(SPIDER_SQL_CLOSE_PAREN_LEN))
+              DBUG_RETURN(HA_ERR_OUT_OF_MEM);
+            str->q_append(SPIDER_SQL_CLOSE_PAREN_STR,
+                          SPIDER_SQL_CLOSE_PAREN_LEN);
           }
           item_count -= 2;
           break;
@@ -5995,23 +6158,19 @@ int spider_db_mbase_util::open_item_func(
           !strncasecmp("curdate", func_name, func_name_length) ||
           !strncasecmp("curtime", func_name, func_name_length)
         ) {
-          if (str)
-            str->length(str->length() - SPIDER_SQL_OPEN_PAREN_LEN);
+          str->length(str->length() - SPIDER_SQL_OPEN_PAREN_LEN);
           DBUG_RETURN(spider_db_open_item_string(item_func, NULL, spider, str,
             alias, alias_length, dbton_id, use_fields, fields));
         } else if (
           !strncasecmp("convert", func_name, func_name_length)
         ) {
-          if (str)
-          {
-            if (str->reserve(func_name_length * 2 + SPIDER_SQL_OPEN_PAREN_LEN))
-              DBUG_RETURN(HA_ERR_OUT_OF_MEM);
-            str->q_append(func_name, func_name_length);
-            str->q_append(SPIDER_SQL_OPEN_PAREN_STR,
-              SPIDER_SQL_OPEN_PAREN_LEN);
-            last_str = SPIDER_SQL_CLOSE_PAREN_STR;
-            last_str_length = SPIDER_SQL_CLOSE_PAREN_LEN;
-          }
+          if (str->reserve(func_name_length * 2 + SPIDER_SQL_OPEN_PAREN_LEN))
+            DBUG_RETURN(HA_ERR_OUT_OF_MEM);
+          str->q_append(func_name, func_name_length);
+          str->q_append(SPIDER_SQL_OPEN_PAREN_STR,
+            SPIDER_SQL_OPEN_PAREN_LEN);
+          last_str = SPIDER_SQL_CLOSE_PAREN_STR;
+          last_str_length = SPIDER_SQL_CLOSE_PAREN_LEN;
           break;
         }
       } else if (func_name_length == 8 &&
@@ -6020,8 +6179,7 @@ int spider_db_mbase_util::open_item_func(
           !strncasecmp("utc_time", func_name, func_name_length)
         )
       ) {
-        if (str)
-          str->length(str->length() - SPIDER_SQL_OPEN_PAREN_LEN);
+        str->length(str->length() - SPIDER_SQL_OPEN_PAREN_LEN);
         DBUG_RETURN(spider_db_open_item_string(item_func, NULL, spider, str,
           alias, alias_length, dbton_id, use_fields, fields));
       } else if (func_name_length == 9 &&
@@ -6039,14 +6197,12 @@ int spider_db_mbase_util::open_item_func(
           break;
         } else if (!strncasecmp("column_get", func_name, func_name_length))
         {
-          if (str)
-          {
-            str->length(str->length() - SPIDER_SQL_OPEN_PAREN_LEN);
-            if (str->reserve(func_name_length + SPIDER_SQL_OPEN_PAREN_LEN))
-              DBUG_RETURN(HA_ERR_OUT_OF_MEM);
-            str->q_append(func_name, func_name_length);
-            str->q_append(SPIDER_SQL_OPEN_PAREN_STR, SPIDER_SQL_OPEN_PAREN_LEN);
-          }
+          str->length(str->length() - SPIDER_SQL_OPEN_PAREN_LEN);
+          if (str->reserve(func_name_length + SPIDER_SQL_OPEN_PAREN_LEN))
+            DBUG_RETURN(HA_ERR_OUT_OF_MEM);
+          str->q_append(func_name, func_name_length);
+          str->q_append(SPIDER_SQL_OPEN_PAREN_STR, SPIDER_SQL_OPEN_PAREN_LEN);
+
           func_name = SPIDER_SQL_COMMA_STR;
           func_name_length = SPIDER_SQL_COMMA_LEN;
           separator_str = SPIDER_SQL_COMMA_STR;
@@ -6066,7 +6222,7 @@ int spider_db_mbase_util::open_item_func(
             {
               const char *child_func_name;
               int child_func_name_length;
-              LEX_CSTRING org_func_name= ifunc->func_name_cstring();
+              org_func_name= ifunc->func_name_cstring();
               DBUG_PRINT("info",("spider child is UNKNOWN_FUNC"));
               child_func_name = org_func_name.str;
               child_func_name_length =  org_func_name.length;
@@ -6081,15 +6237,12 @@ int spider_db_mbase_util::open_item_func(
             }
           }
 
-          if (str)
+          str->length(str->length() - SPIDER_SQL_OPEN_PAREN_LEN);
+          if (!merge_func)
           {
-            str->length(str->length() - SPIDER_SQL_OPEN_PAREN_LEN);
-            if (!merge_func)
-            {
-              if (str->reserve(SPIDER_SQL_CAST_LEN))
-                DBUG_RETURN(HA_ERR_OUT_OF_MEM);
-              str->q_append(SPIDER_SQL_CAST_STR, SPIDER_SQL_CAST_LEN);
-            }
+            if (str->reserve(SPIDER_SQL_CAST_LEN))
+              DBUG_RETURN(HA_ERR_OUT_OF_MEM);
+            str->q_append(SPIDER_SQL_CAST_STR, SPIDER_SQL_CAST_LEN);
           }
           last_str = SPIDER_SQL_AS_DATE_STR;
           last_str_length = SPIDER_SQL_AS_DATE_LEN;
@@ -6105,7 +6258,7 @@ int spider_db_mbase_util::open_item_func(
             {
               const char *child_func_name;
               int child_func_name_length;
-              LEX_CSTRING org_func_name= ifunc->func_name_cstring();
+              org_func_name= ifunc->func_name_cstring();
               DBUG_PRINT("info",("spider child is UNKNOWN_FUNC"));
               child_func_name = org_func_name.str;
               child_func_name_length =  org_func_name.length;
@@ -6120,15 +6273,12 @@ int spider_db_mbase_util::open_item_func(
             }
           }
 
-          if (str)
+          str->length(str->length() - SPIDER_SQL_OPEN_PAREN_LEN);
+          if (!merge_func)
           {
-            str->length(str->length() - SPIDER_SQL_OPEN_PAREN_LEN);
-            if (!merge_func)
-            {
-              if (str->reserve(SPIDER_SQL_CAST_LEN))
-                DBUG_RETURN(HA_ERR_OUT_OF_MEM);
-              str->q_append(SPIDER_SQL_CAST_STR, SPIDER_SQL_CAST_LEN);
-            }
+            if (str->reserve(SPIDER_SQL_CAST_LEN))
+              DBUG_RETURN(HA_ERR_OUT_OF_MEM);
+            str->q_append(SPIDER_SQL_CAST_STR, SPIDER_SQL_CAST_LEN);
           }
           last_str = SPIDER_SQL_AS_TIME_STR;
           last_str_length = SPIDER_SQL_AS_TIME_LEN;
@@ -6138,94 +6288,12 @@ int spider_db_mbase_util::open_item_func(
       {
         if (!strncasecmp("utc_timestamp", func_name, func_name_length))
         {
-          if (str)
-            str->length(str->length() - SPIDER_SQL_OPEN_PAREN_LEN);
+          str->length(str->length() - SPIDER_SQL_OPEN_PAREN_LEN);
           DBUG_RETURN(spider_db_open_item_string(item_func, NULL, spider, str,
             alias, alias_length, dbton_id, use_fields, fields));
         } else if (!strncasecmp("timestampdiff", func_name, func_name_length))
         {
-#ifdef ITEM_FUNC_TIMESTAMPDIFF_ARE_PUBLIC
-          Item_func_timestamp_diff *item_func_timestamp_diff =
-            (Item_func_timestamp_diff *) item_func;
-          if (str)
-          {
-            const char *interval_str;
-            uint interval_len;
-            switch (item_func_timestamp_diff->int_type)
-            {
-              case INTERVAL_YEAR:
-                interval_str = SPIDER_SQL_YEAR_STR;
-                interval_len = SPIDER_SQL_YEAR_LEN;
-                break;
-              case INTERVAL_QUARTER:
-                interval_str = SPIDER_SQL_QUARTER_STR;
-                interval_len = SPIDER_SQL_QUARTER_LEN;
-                break;
-              case INTERVAL_MONTH:
-                interval_str = SPIDER_SQL_MONTH_STR;
-                interval_len = SPIDER_SQL_MONTH_LEN;
-                break;
-              case INTERVAL_WEEK:
-                interval_str = SPIDER_SQL_WEEK_STR;
-                interval_len = SPIDER_SQL_WEEK_LEN;
-                break;
-              case INTERVAL_DAY:
-                interval_str = SPIDER_SQL_DAY_STR;
-                interval_len = SPIDER_SQL_DAY_LEN;
-                break;
-              case INTERVAL_HOUR:
-                interval_str = SPIDER_SQL_HOUR_STR;
-                interval_len = SPIDER_SQL_HOUR_LEN;
-                break;
-              case INTERVAL_MINUTE:
-                interval_str = SPIDER_SQL_MINUTE_STR;
-                interval_len = SPIDER_SQL_MINUTE_LEN;
-                break;
-              case INTERVAL_SECOND:
-                interval_str = SPIDER_SQL_SECOND_STR;
-                interval_len = SPIDER_SQL_SECOND_LEN;
-                break;
-              case INTERVAL_MICROSECOND:
-                interval_str = SPIDER_SQL_MICROSECOND_STR;
-                interval_len = SPIDER_SQL_MICROSECOND_LEN;
-                break;
-              default:
-                interval_str = "";
-                interval_len = 0;
-                break;
-            }
-            str->length(str->length() - SPIDER_SQL_OPEN_PAREN_LEN);
-            if (str->reserve(func_name_length + SPIDER_SQL_OPEN_PAREN_LEN +
-              interval_len + SPIDER_SQL_COMMA_LEN))
-              DBUG_RETURN(HA_ERR_OUT_OF_MEM);
-            str->q_append(func_name, func_name_length);
-            str->q_append(SPIDER_SQL_OPEN_PAREN_STR, SPIDER_SQL_OPEN_PAREN_LEN);
-            str->q_append(interval_str, interval_len);
-            str->q_append(SPIDER_SQL_COMMA_STR, SPIDER_SQL_COMMA_LEN);
-          }
-          if ((error_num = spider_db_print_item_type(item_list[0], NULL, spider,
-            str, alias, alias_length, dbton_id, use_fields, fields)))
-            DBUG_RETURN(error_num);
-          if (str)
-          {
-            if (str->reserve(SPIDER_SQL_COMMA_LEN))
-              DBUG_RETURN(HA_ERR_OUT_OF_MEM);
-            str->q_append(SPIDER_SQL_COMMA_STR, SPIDER_SQL_COMMA_LEN);
-          }
-          if ((error_num = spider_db_print_item_type(item_list[1], NULL, spider,
-            str, alias, alias_length, dbton_id, use_fields, fields)))
-            DBUG_RETURN(error_num);
-          if (str)
-          {
-            if (str->reserve(SPIDER_SQL_CLOSE_PAREN_LEN))
-              DBUG_RETURN(HA_ERR_OUT_OF_MEM);
-            str->q_append(SPIDER_SQL_CLOSE_PAREN_STR,
-              SPIDER_SQL_CLOSE_PAREN_LEN);
-          }
-          DBUG_RETURN(0);
-#else
           DBUG_RETURN(ER_SPIDER_COND_SKIP_NUM);
-#endif
         }
       } else if (func_name_length == 14)
       {
@@ -6240,7 +6308,7 @@ int spider_db_mbase_util::open_item_func(
             {
               const char *child_func_name;
               int child_func_name_length;
-              LEX_CSTRING org_func_name= ifunc->func_name_cstring();
+              org_func_name= ifunc->func_name_cstring();
               DBUG_PRINT("info",("spider child is UNKNOWN_FUNC"));
               child_func_name = org_func_name.str;
               child_func_name_length =  org_func_name.length;
@@ -6255,34 +6323,27 @@ int spider_db_mbase_util::open_item_func(
             }
           }
 
-          if (str)
+          char tmp_buf[MAX_FIELD_WIDTH], *tmp_ptr, *tmp_ptr2;
+          spider_string tmp_str(tmp_buf, MAX_FIELD_WIDTH, str->charset());
+          tmp_str.init_calc_mem(123);
+          tmp_str.length(0);
+          str->length(str->length() - SPIDER_SQL_OPEN_PAREN_LEN);
+          if (!merge_func)
           {
-            char tmp_buf[MAX_FIELD_WIDTH], *tmp_ptr, *tmp_ptr2;
-            spider_string tmp_str(tmp_buf, MAX_FIELD_WIDTH, str->charset());
-            tmp_str.init_calc_mem(123);
-            tmp_str.length(0);
-            str->length(str->length() - SPIDER_SQL_OPEN_PAREN_LEN);
-            if (!merge_func)
-            {
-              if (str->reserve(SPIDER_SQL_CAST_LEN))
-                DBUG_RETURN(HA_ERR_OUT_OF_MEM);
-              str->q_append(SPIDER_SQL_CAST_STR, SPIDER_SQL_CAST_LEN);
-            }
-#if MYSQL_VERSION_ID < 50500
-            item_func->print(tmp_str.get_str(), QT_IS);
-#else
-            item_func->print(tmp_str.get_str(), QT_TO_SYSTEM_CHARSET);
-#endif
-            tmp_str.mem_calc();
-            if (tmp_str.reserve(1))
+            if (str->reserve(SPIDER_SQL_CAST_LEN))
               DBUG_RETURN(HA_ERR_OUT_OF_MEM);
-            tmp_ptr = tmp_str.c_ptr_quick();
-            DBUG_PRINT("info",("spider tmp_ptr = %s", tmp_ptr));
-            while ((tmp_ptr2 = strstr(tmp_ptr, SPIDER_SQL_AS_BINARY_STR)))
-              tmp_ptr = tmp_ptr2 + 1;
-            last_str = tmp_ptr - 1;
-            last_str_length = strlen(last_str) - SPIDER_SQL_CLOSE_PAREN_LEN;
+            str->q_append(SPIDER_SQL_CAST_STR, SPIDER_SQL_CAST_LEN);
           }
+          item_func->print(tmp_str.get_str(), QT_TO_SYSTEM_CHARSET);
+          tmp_str.mem_calc();
+          if (tmp_str.reserve(1))
+            DBUG_RETURN(HA_ERR_OUT_OF_MEM);
+          tmp_ptr = tmp_str.c_ptr_quick();
+          DBUG_PRINT("info",("spider tmp_ptr = %s", tmp_ptr));
+          while ((tmp_ptr2 = strstr(tmp_ptr, SPIDER_SQL_AS_BINARY_STR)))
+            tmp_ptr = tmp_ptr2 + 1;
+          last_str = tmp_ptr - 1;
+          last_str_length = strlen(last_str) - SPIDER_SQL_CLOSE_PAREN_LEN;
           break;
         } else if (!strncasecmp("cast_as_signed", func_name, func_name_length))
         {
@@ -6295,7 +6356,7 @@ int spider_db_mbase_util::open_item_func(
             {
               const char *child_func_name;
               int child_func_name_length;
-              LEX_CSTRING org_func_name= ifunc->func_name_cstring();
+              org_func_name= ifunc->func_name_cstring();
               DBUG_PRINT("info",("spider child is UNKNOWN_FUNC"));
               child_func_name = org_func_name.str;
               child_func_name_length =  org_func_name.length;
@@ -6310,15 +6371,12 @@ int spider_db_mbase_util::open_item_func(
             }
           }
 
-          if (str)
+          str->length(str->length() - SPIDER_SQL_OPEN_PAREN_LEN);
+          if (!merge_func)
           {
-            str->length(str->length() - SPIDER_SQL_OPEN_PAREN_LEN);
-            if (!merge_func)
-            {
-              if (str->reserve(SPIDER_SQL_CAST_LEN))
-                DBUG_RETURN(HA_ERR_OUT_OF_MEM);
-              str->q_append(SPIDER_SQL_CAST_STR, SPIDER_SQL_CAST_LEN);
-            }
+            if (str->reserve(SPIDER_SQL_CAST_LEN))
+              DBUG_RETURN(HA_ERR_OUT_OF_MEM);
+            str->q_append(SPIDER_SQL_CAST_STR, SPIDER_SQL_CAST_LEN);
           }
           last_str = SPIDER_SQL_AS_SIGNED_STR;
           last_str_length = SPIDER_SQL_AS_SIGNED_LEN;
@@ -6337,7 +6395,7 @@ int spider_db_mbase_util::open_item_func(
             {
               const char *child_func_name;
               int child_func_name_length;
-              LEX_CSTRING org_func_name= ifunc->func_name_cstring();
+              org_func_name= ifunc->func_name_cstring();
               DBUG_PRINT("info",("spider child is UNKNOWN_FUNC"));
               child_func_name = org_func_name.str;
               child_func_name_length =  org_func_name.length;
@@ -6352,15 +6410,12 @@ int spider_db_mbase_util::open_item_func(
             }
           }
 
-          if (str)
+          str->length(str->length() - SPIDER_SQL_OPEN_PAREN_LEN);
+          if (!merge_func)
           {
-            str->length(str->length() - SPIDER_SQL_OPEN_PAREN_LEN);
-            if (!merge_func)
-            {
-              if (str->reserve(SPIDER_SQL_CAST_LEN))
-                DBUG_RETURN(HA_ERR_OUT_OF_MEM);
-              str->q_append(SPIDER_SQL_CAST_STR, SPIDER_SQL_CAST_LEN);
-            }
+            if (str->reserve(SPIDER_SQL_CAST_LEN))
+              DBUG_RETURN(HA_ERR_OUT_OF_MEM);
+            str->q_append(SPIDER_SQL_CAST_STR, SPIDER_SQL_CAST_LEN);
           }
           last_str = SPIDER_SQL_AS_UNSIGNED_STR;
           last_str_length = SPIDER_SQL_AS_UNSIGNED_LEN;
@@ -6377,7 +6432,7 @@ int spider_db_mbase_util::open_item_func(
             {
               const char *child_func_name;
               int child_func_name_length;
-              LEX_CSTRING org_func_name= ifunc->func_name_cstring();
+              org_func_name= ifunc->func_name_cstring();
               DBUG_PRINT("info",("spider child is UNKNOWN_FUNC"));
               child_func_name = org_func_name.str;
               child_func_name_length =  org_func_name.length;
@@ -6392,34 +6447,27 @@ int spider_db_mbase_util::open_item_func(
             }
           }
 
-          if (str)
+          char tmp_buf[MAX_FIELD_WIDTH], *tmp_ptr, *tmp_ptr2;
+          spider_string tmp_str(tmp_buf, MAX_FIELD_WIDTH, str->charset());
+          tmp_str.init_calc_mem(124);
+          tmp_str.length(0);
+          str->length(str->length() - SPIDER_SQL_OPEN_PAREN_LEN);
+          if (!merge_func)
           {
-            char tmp_buf[MAX_FIELD_WIDTH], *tmp_ptr, *tmp_ptr2;
-            spider_string tmp_str(tmp_buf, MAX_FIELD_WIDTH, str->charset());
-            tmp_str.init_calc_mem(124);
-            tmp_str.length(0);
-            str->length(str->length() - SPIDER_SQL_OPEN_PAREN_LEN);
-            if (!merge_func)
-            {
-              if (str->reserve(SPIDER_SQL_CAST_LEN))
-                DBUG_RETURN(HA_ERR_OUT_OF_MEM);
-              str->q_append(SPIDER_SQL_CAST_STR, SPIDER_SQL_CAST_LEN);
-            }
-#if MYSQL_VERSION_ID < 50500
-            item_func->print(tmp_str.get_str(), QT_IS);
-#else
-            item_func->print(tmp_str.get_str(), QT_TO_SYSTEM_CHARSET);
-#endif
-            tmp_str.mem_calc();
-            if (tmp_str.reserve(1))
+            if (str->reserve(SPIDER_SQL_CAST_LEN))
               DBUG_RETURN(HA_ERR_OUT_OF_MEM);
-            tmp_ptr = tmp_str.c_ptr_quick();
-            DBUG_PRINT("info",("spider tmp_ptr = %s", tmp_ptr));
-            while ((tmp_ptr2 = strstr(tmp_ptr, SPIDER_SQL_AS_DECIMAL_STR)))
-              tmp_ptr = tmp_ptr2 + 1;
-            last_str = tmp_ptr - 1;
-            last_str_length = strlen(last_str) - SPIDER_SQL_CLOSE_PAREN_LEN;
+            str->q_append(SPIDER_SQL_CAST_STR, SPIDER_SQL_CAST_LEN);
           }
+          item_func->print(tmp_str.get_str(), QT_TO_SYSTEM_CHARSET);
+          tmp_str.mem_calc();
+          if (tmp_str.reserve(1))
+            DBUG_RETURN(HA_ERR_OUT_OF_MEM);
+          tmp_ptr = tmp_str.c_ptr_quick();
+          DBUG_PRINT("info",("spider tmp_ptr = %s", tmp_ptr));
+          while ((tmp_ptr2 = strstr(tmp_ptr, SPIDER_SQL_AS_DECIMAL_STR)))
+            tmp_ptr = tmp_ptr2 + 1;
+          last_str = tmp_ptr - 1;
+          last_str_length = strlen(last_str) - SPIDER_SQL_CLOSE_PAREN_LEN;
           break;
         } else if (!strncasecmp("cast_as_datetime", func_name,
           func_name_length))
@@ -6433,7 +6481,7 @@ int spider_db_mbase_util::open_item_func(
             {
               const char *child_func_name;
               int child_func_name_length;
-              LEX_CSTRING org_func_name= ifunc->func_name_cstring();
+              org_func_name= ifunc->func_name_cstring();
               DBUG_PRINT("info",("spider child is UNKNOWN_FUNC"));
               child_func_name = org_func_name.str;
               child_func_name_length =  org_func_name.length;
@@ -6448,15 +6496,12 @@ int spider_db_mbase_util::open_item_func(
             }
           }
 
-          if (str)
+          str->length(str->length() - SPIDER_SQL_OPEN_PAREN_LEN);
+          if (!merge_func)
           {
-            str->length(str->length() - SPIDER_SQL_OPEN_PAREN_LEN);
-            if (!merge_func)
-            {
-              if (str->reserve(SPIDER_SQL_CAST_LEN))
-                DBUG_RETURN(HA_ERR_OUT_OF_MEM);
-              str->q_append(SPIDER_SQL_CAST_STR, SPIDER_SQL_CAST_LEN);
-            }
+            if (str->reserve(SPIDER_SQL_CAST_LEN))
+              DBUG_RETURN(HA_ERR_OUT_OF_MEM);
+            str->q_append(SPIDER_SQL_CAST_STR, SPIDER_SQL_CAST_LEN);
           }
           last_str = SPIDER_SQL_AS_DATETIME_STR;
           last_str_length = SPIDER_SQL_AS_DATETIME_LEN;
@@ -6474,41 +6519,32 @@ int spider_db_mbase_util::open_item_func(
           if ((error_num = spider_db_print_item_type(item_list[0], NULL, spider,
             str, alias, alias_length, dbton_id, use_fields, fields)))
             DBUG_RETURN(error_num);
-          if (str)
+          if (item_date_add_interval->date_sub_interval)
           {
-            if (item_date_add_interval->date_sub_interval)
-            {
-              if (str->reserve(SPIDER_SQL_NEGINTERVAL_LEN))
-                DBUG_RETURN(HA_ERR_OUT_OF_MEM);
-              str->q_append(SPIDER_SQL_NEGINTERVAL_STR,
-                SPIDER_SQL_NEGINTERVAL_LEN);
-            } else {
-              if (str->reserve(SPIDER_SQL_INTERVAL_LEN))
-                DBUG_RETURN(HA_ERR_OUT_OF_MEM);
-              str->q_append(SPIDER_SQL_INTERVAL_STR, SPIDER_SQL_INTERVAL_LEN);
-            }
+            if (str->reserve(SPIDER_SQL_NEGINTERVAL_LEN))
+              DBUG_RETURN(HA_ERR_OUT_OF_MEM);
+            str->q_append(SPIDER_SQL_NEGINTERVAL_STR,
+              SPIDER_SQL_NEGINTERVAL_LEN);
+          } else {
+            if (str->reserve(SPIDER_SQL_INTERVAL_LEN))
+              DBUG_RETURN(HA_ERR_OUT_OF_MEM);
+            str->q_append(SPIDER_SQL_INTERVAL_STR, SPIDER_SQL_INTERVAL_LEN);
           }
           if ((error_num = spider_db_print_item_type(item_list[1], NULL, spider,
             str, alias, alias_length, dbton_id, use_fields, fields)))
             DBUG_RETURN(error_num);
-          if (str)
-          {
-            if (str->reserve(func_name_length + SPIDER_SQL_CLOSE_PAREN_LEN))
-              DBUG_RETURN(HA_ERR_OUT_OF_MEM);
-            str->q_append(func_name, func_name_length);
-            str->q_append(SPIDER_SQL_CLOSE_PAREN_STR,
-              SPIDER_SQL_CLOSE_PAREN_LEN);
-          }
+          if (str->reserve(func_name_length + SPIDER_SQL_CLOSE_PAREN_LEN))
+            DBUG_RETURN(HA_ERR_OUT_OF_MEM);
+          str->q_append(func_name, func_name_length);
+          str->q_append(SPIDER_SQL_CLOSE_PAREN_STR,
+            SPIDER_SQL_CLOSE_PAREN_LEN);
           DBUG_RETURN(0);
         }
       }
-      if (str)
-      {
-        if (str->reserve(func_name_length + SPIDER_SQL_OPEN_PAREN_LEN))
-          DBUG_RETURN(HA_ERR_OUT_OF_MEM);
-        str->q_append(func_name, func_name_length);
-        str->q_append(SPIDER_SQL_OPEN_PAREN_STR, SPIDER_SQL_OPEN_PAREN_LEN);
-      }
+      if (str->reserve(func_name_length + SPIDER_SQL_OPEN_PAREN_LEN))
+        DBUG_RETURN(HA_ERR_OUT_OF_MEM);
+      str->q_append(func_name, func_name_length);
+      str->q_append(SPIDER_SQL_OPEN_PAREN_STR, SPIDER_SQL_OPEN_PAREN_LEN);
       func_name = SPIDER_SQL_COMMA_STR;
       func_name_length = SPIDER_SQL_COMMA_LEN;
       separator_str = SPIDER_SQL_COMMA_STR;
@@ -6517,8 +6553,7 @@ int spider_db_mbase_util::open_item_func(
       last_str_length = SPIDER_SQL_CLOSE_PAREN_LEN;
       break;
     case Item_func::NOW_FUNC:
-      if (str)
-        str->length(str->length() - SPIDER_SQL_OPEN_PAREN_LEN);
+      str->length(str->length() - SPIDER_SQL_OPEN_PAREN_LEN);
       DBUG_RETURN(spider_db_open_item_string(item_func, NULL, spider,
         str, alias, alias_length, dbton_id, use_fields, fields));
     case Item_func::CHAR_TYPECAST_FUNC:
@@ -6533,7 +6568,7 @@ int spider_db_mbase_util::open_item_func(
           {
             const char *child_func_name;
             int child_func_name_length;
-            LEX_CSTRING org_func_name= ifunc->func_name_cstring();
+            org_func_name= ifunc->func_name_cstring();
             DBUG_PRINT("info",("spider child is UNKNOWN_FUNC"));
             child_func_name = org_func_name.str;
             child_func_name_length =  org_func_name.length;
@@ -6548,100 +6583,49 @@ int spider_db_mbase_util::open_item_func(
           }
         }
 
-        if (str)
+        char tmp_buf[MAX_FIELD_WIDTH], *tmp_ptr, *tmp_ptr2;
+        spider_string tmp_str(tmp_buf, MAX_FIELD_WIDTH, str->charset());
+        tmp_str.init_calc_mem(125);
+        tmp_str.length(0);
+        str->length(str->length() - SPIDER_SQL_OPEN_PAREN_LEN);
+        if (!merge_func)
         {
-          char tmp_buf[MAX_FIELD_WIDTH], *tmp_ptr, *tmp_ptr2;
-          spider_string tmp_str(tmp_buf, MAX_FIELD_WIDTH, str->charset());
-          tmp_str.init_calc_mem(125);
-          tmp_str.length(0);
-          str->length(str->length() - SPIDER_SQL_OPEN_PAREN_LEN);
-          if (!merge_func)
-          {
-            if (str->reserve(SPIDER_SQL_CAST_LEN))
-              DBUG_RETURN(HA_ERR_OUT_OF_MEM);
-            str->q_append(SPIDER_SQL_CAST_STR, SPIDER_SQL_CAST_LEN);
-          }
-#if MYSQL_VERSION_ID < 50500
-          item_func->print(tmp_str.get_str(), QT_IS);
-#else
-          item_func->print(tmp_str.get_str(), QT_TO_SYSTEM_CHARSET);
-#endif
-          tmp_str.mem_calc();
-          if (tmp_str.reserve(1))
+          if (str->reserve(SPIDER_SQL_CAST_LEN))
             DBUG_RETURN(HA_ERR_OUT_OF_MEM);
-          tmp_ptr = tmp_str.c_ptr_quick();
-          DBUG_PRINT("info",("spider tmp_ptr = %s", tmp_ptr));
-          while ((tmp_ptr2 = strstr(tmp_ptr, SPIDER_SQL_AS_CHAR_STR)))
-            tmp_ptr = tmp_ptr2 + 1;
-          last_str = tmp_ptr - 1;
-          last_str_length = strlen(last_str) - SPIDER_SQL_CLOSE_PAREN_LEN;
+          str->q_append(SPIDER_SQL_CAST_STR, SPIDER_SQL_CAST_LEN);
         }
+        item_func->print(tmp_str.get_str(), QT_TO_SYSTEM_CHARSET);
+        tmp_str.mem_calc();
+        if (tmp_str.reserve(1))
+          DBUG_RETURN(HA_ERR_OUT_OF_MEM);
+        tmp_ptr = tmp_str.c_ptr_quick();
+        DBUG_PRINT("info",("spider tmp_ptr = %s", tmp_ptr));
+        while ((tmp_ptr2 = strstr(tmp_ptr, SPIDER_SQL_AS_CHAR_STR)))
+          tmp_ptr = tmp_ptr2 + 1;
+        last_str = tmp_ptr - 1;
+        last_str_length = strlen(last_str) - SPIDER_SQL_CLOSE_PAREN_LEN;
       }
       break;
     case Item_func::NOT_FUNC:
       DBUG_PRINT("info",("spider NOT_FUNC"));
-      if (item_list[0]->type() == Item::COND_ITEM)
-      {
-        DBUG_PRINT("info",("spider item_list[0] is COND_ITEM"));
-        Item_cond *item_cond = (Item_cond *) item_list[0];
-        if (item_cond->functype() == Item_func::COND_AND_FUNC)
-        {
-          DBUG_PRINT("info",("spider item_cond is COND_AND_FUNC"));
-          List_iterator_fast<Item> lif(*(item_cond->argument_list()));
-          bool has_expr_cache_item = FALSE;
-          bool has_isnotnull_func = FALSE;
-          bool has_other_item = FALSE;
-          while((item = lif++))
-          {
-#ifdef SPIDER_HAS_EXPR_CACHE_ITEM
-            if (
-              item->type() == Item::EXPR_CACHE_ITEM
-            ) {
-              DBUG_PRINT("info",("spider EXPR_CACHE_ITEM"));
-              has_expr_cache_item = TRUE;
-            } else
-#endif
-            if (
-              item->type() == Item::FUNC_ITEM &&
-              ((Item_func *) item)->functype() == Item_func::ISNOTNULL_FUNC
-            ) {
-              DBUG_PRINT("info",("spider ISNOTNULL_FUNC"));
-              has_isnotnull_func = TRUE;
-            } else {
-              DBUG_PRINT("info",("spider has other item"));
-              DBUG_PRINT("info",("spider COND type=%d", item->type()));
-              has_other_item = TRUE;
-            }
-          }
-          if (has_expr_cache_item && has_isnotnull_func && !has_other_item)
-          {
-            DBUG_PRINT("info",("spider NOT EXISTS skip"));
-            DBUG_RETURN(ER_SPIDER_COND_SKIP_NUM);
-          }
-        }
-      }
-      if (str)
-      {
-        LEX_CSTRING org_func_name= item_func->func_name_cstring();
-        func_name = org_func_name.str;
-        func_name_length = org_func_name.length;
-        if (str->reserve(func_name_length + SPIDER_SQL_SPACE_LEN))
-          DBUG_RETURN(HA_ERR_OUT_OF_MEM);
-        str->q_append(func_name, func_name_length);
-        str->q_append(SPIDER_SQL_SPACE_STR, SPIDER_SQL_SPACE_LEN);
-      }
+      if (not_func_should_be_skipped(item_func))
+        DBUG_RETURN(ER_SPIDER_COND_SKIP_NUM);
+      org_func_name= item_func->func_name_cstring();
+      func_name = org_func_name.str;
+      func_name_length = org_func_name.length;
+      if (str->reserve(func_name_length + SPIDER_SQL_SPACE_LEN))
+        DBUG_RETURN(HA_ERR_OUT_OF_MEM);
+      str->q_append(func_name, func_name_length);
+      str->q_append(SPIDER_SQL_SPACE_STR, SPIDER_SQL_SPACE_LEN);
       break;
     case Item_func::NEG_FUNC:
-      if (str)
-      {
-        LEX_CSTRING org_func_name= item_func->func_name_cstring();
-        func_name = org_func_name.str;
-        func_name_length = org_func_name.length;
-        if (str->reserve(func_name_length + SPIDER_SQL_SPACE_LEN))
-          DBUG_RETURN(HA_ERR_OUT_OF_MEM);
-        str->q_append(func_name, func_name_length);
-        str->q_append(SPIDER_SQL_SPACE_STR, SPIDER_SQL_SPACE_LEN);
-      }
+      org_func_name= item_func->func_name_cstring();
+      func_name = org_func_name.str;
+      func_name_length = org_func_name.length;
+      if (str->reserve(func_name_length + SPIDER_SQL_SPACE_LEN))
+        DBUG_RETURN(HA_ERR_OUT_OF_MEM);
+      str->q_append(func_name, func_name_length);
+      str->q_append(SPIDER_SQL_SPACE_STR, SPIDER_SQL_SPACE_LEN);
       break;
     case Item_func::IN_FUNC:
       if (((Item_func_opt_neg *) item_func)->negated)
@@ -6669,7 +6653,7 @@ int spider_db_mbase_util::open_item_func(
         separator_str = SPIDER_SQL_AND_STR;
         separator_str_length = SPIDER_SQL_AND_LEN;
       } else {
-        LEX_CSTRING org_func_name= item_func->func_name_cstring();
+        org_func_name= item_func->func_name_cstring();
         func_name = org_func_name.str;
         func_name_length = org_func_name.length;
         separator_str = SPIDER_SQL_AND_STR;
@@ -6682,18 +6666,15 @@ int spider_db_mbase_util::open_item_func(
         spider->share->use_pushdown_udf);
       if (!use_pushdown_udf)
         DBUG_RETURN(ER_SPIDER_COND_SKIP_NUM);
-      if (str)
-      {
-        LEX_CSTRING org_func_name= item_func->func_name_cstring();
-        func_name = org_func_name.str;
-        func_name_length = org_func_name.length;
-        DBUG_PRINT("info",("spider func_name = %s", func_name));
-        DBUG_PRINT("info",("spider func_name_length = %d", func_name_length));
-        if (str->reserve(func_name_length + SPIDER_SQL_OPEN_PAREN_LEN))
-          DBUG_RETURN(HA_ERR_OUT_OF_MEM);
-        str->q_append(func_name, func_name_length);
-        str->q_append(SPIDER_SQL_OPEN_PAREN_STR, SPIDER_SQL_OPEN_PAREN_LEN);
-      }
+      org_func_name= item_func->func_name_cstring();
+      func_name = org_func_name.str;
+      func_name_length = org_func_name.length;
+      DBUG_PRINT("info",("spider func_name = %s", func_name));
+      DBUG_PRINT("info",("spider func_name_length = %d", func_name_length));
+      if (str->reserve(func_name_length + SPIDER_SQL_OPEN_PAREN_LEN))
+        DBUG_RETURN(HA_ERR_OUT_OF_MEM);
+      str->q_append(func_name, func_name_length);
+      str->q_append(SPIDER_SQL_OPEN_PAREN_STR, SPIDER_SQL_OPEN_PAREN_LEN);
       func_name = SPIDER_SQL_COMMA_STR;
       func_name_length = SPIDER_SQL_COMMA_LEN;
       separator_str = SPIDER_SQL_COMMA_STR;
@@ -6701,21 +6682,15 @@ int spider_db_mbase_util::open_item_func(
       last_str = SPIDER_SQL_CLOSE_PAREN_STR;
       last_str_length = SPIDER_SQL_CLOSE_PAREN_LEN;
       break;
-#ifdef MARIADB_BASE_VERSION
     case Item_func::XOR_FUNC:
-#else
-    case Item_func::COND_XOR_FUNC:
-#endif
-      if (str)
-        str->length(str->length() - SPIDER_SQL_OPEN_PAREN_LEN);
+      str->length(str->length() - SPIDER_SQL_OPEN_PAREN_LEN);
       DBUG_RETURN(
         spider_db_open_item_cond((Item_cond *) item_func, spider, str,
           alias, alias_length, dbton_id, use_fields, fields));
     case Item_func::TRIG_COND_FUNC:
       DBUG_RETURN(ER_SPIDER_COND_SKIP_NUM);
     case Item_func::GUSERVAR_FUNC:
-      if (str)
-        str->length(str->length() - SPIDER_SQL_OPEN_PAREN_LEN);
+      str->length(str->length() - SPIDER_SQL_OPEN_PAREN_LEN);
       if (item_func->result_type() == STRING_RESULT)
         DBUG_RETURN(spider_db_open_item_string(item_func, NULL, spider, str,
           alias, alias_length, dbton_id, use_fields, fields));
@@ -6726,28 +6701,22 @@ int spider_db_mbase_util::open_item_func(
       if (spider_db_check_ft_idx(item_func, spider) == MAX_KEY)
         DBUG_RETURN(ER_SPIDER_COND_SKIP_NUM);
       start_item = 1;
-      if (str)
-      {
-        if (str->reserve(SPIDER_SQL_MATCH_LEN))
-          DBUG_RETURN(HA_ERR_OUT_OF_MEM);
-        str->q_append(SPIDER_SQL_MATCH_STR, SPIDER_SQL_MATCH_LEN);
-      }
+      if (str->reserve(SPIDER_SQL_MATCH_LEN))
+        DBUG_RETURN(HA_ERR_OUT_OF_MEM);
+      str->q_append(SPIDER_SQL_MATCH_STR, SPIDER_SQL_MATCH_LEN);
       separator_str = SPIDER_SQL_COMMA_STR;
       separator_str_length = SPIDER_SQL_COMMA_LEN;
       last_str = SPIDER_SQL_CLOSE_PAREN_STR;
       last_str_length = SPIDER_SQL_CLOSE_PAREN_LEN;
       break;
     case Item_func::SP_EQUALS_FUNC:
-      if (str)
-      {
-        func_name = SPIDER_SQL_MBR_EQUAL_STR;
-        func_name_length = SPIDER_SQL_MBR_EQUAL_LEN;
-        DBUG_PRINT("info",("spider func_name = %s", func_name));
-        DBUG_PRINT("info",("spider func_name_length = %d", func_name_length));
-        if (str->reserve(func_name_length))
-          DBUG_RETURN(HA_ERR_OUT_OF_MEM);
-        str->q_append(func_name, func_name_length);
-      }
+      func_name = SPIDER_SQL_MBR_EQUAL_STR;
+      func_name_length = SPIDER_SQL_MBR_EQUAL_LEN;
+      DBUG_PRINT("info",("spider func_name = %s", func_name));
+      DBUG_PRINT("info",("spider func_name_length = %d", func_name_length));
+      if (str->reserve(func_name_length))
+        DBUG_RETURN(HA_ERR_OUT_OF_MEM);
+      str->q_append(func_name, func_name_length);
       func_name = SPIDER_SQL_COMMA_STR;
       func_name_length = SPIDER_SQL_COMMA_LEN;
       separator_str = SPIDER_SQL_COMMA_STR;
@@ -6762,25 +6731,16 @@ int spider_db_mbase_util::open_item_func(
     case Item_func::SP_WITHIN_FUNC:
     case Item_func::SP_CONTAINS_FUNC:
     case Item_func::SP_OVERLAPS_FUNC:
-      if (str)
-      {
-        LEX_CSTRING org_func_name= item_func->func_name_cstring();
-        func_name = org_func_name.str;
-        func_name_length = org_func_name.length;
-        DBUG_PRINT("info",("spider func_name = %s", func_name));
-        DBUG_PRINT("info",("spider func_name_length = %d", func_name_length));
-        if (str->reserve(
-#ifndef SPIDER_ITEM_GEOFUNC_NAME_HAS_MBR
-          SPIDER_SQL_MBR_LEN +
-#endif
-          func_name_length + SPIDER_SQL_OPEN_PAREN_LEN))
-          DBUG_RETURN(HA_ERR_OUT_OF_MEM);
-#ifndef SPIDER_ITEM_GEOFUNC_NAME_HAS_MBR
-        str->q_append(SPIDER_SQL_MBR_STR, SPIDER_SQL_MBR_LEN);
-#endif
-        str->q_append(func_name, func_name_length);
-        str->q_append(SPIDER_SQL_OPEN_PAREN_STR, SPIDER_SQL_OPEN_PAREN_LEN);
-      }
+      org_func_name= item_func->func_name_cstring();
+      func_name = org_func_name.str;
+      func_name_length = org_func_name.length;
+      DBUG_PRINT("info",("spider func_name = %s", func_name));
+      DBUG_PRINT("info",("spider func_name_length = %d", func_name_length));
+      if (str->reserve(
+        func_name_length + SPIDER_SQL_OPEN_PAREN_LEN))
+        DBUG_RETURN(HA_ERR_OUT_OF_MEM);
+      str->q_append(func_name, func_name_length);
+      str->q_append(SPIDER_SQL_OPEN_PAREN_STR, SPIDER_SQL_OPEN_PAREN_LEN);
       func_name = SPIDER_SQL_COMMA_STR;
       func_name_length = SPIDER_SQL_COMMA_LEN;
       separator_str = SPIDER_SQL_COMMA_STR;
@@ -6795,109 +6755,33 @@ int spider_db_mbase_util::open_item_func(
     case Item_func::LE_FUNC:
     case Item_func::GE_FUNC:
     case Item_func::GT_FUNC:
-      if (str)
-      {
-        LEX_CSTRING org_func_name= item_func->func_name_cstring();
-        func_name = org_func_name.str;
-        func_name_length = org_func_name.length;
-      }
+      org_func_name= item_func->func_name_cstring();
+      func_name = org_func_name.str;
+      func_name_length = org_func_name.length;
       break;
     case Item_func::LIKE_FUNC:
-#ifdef SPIDER_LIKE_FUNC_HAS_GET_NEGATED
-      if (str)
+      if (((Item_func_like *)item_func)->get_negated())
+      {
+        func_name = SPIDER_SQL_NOT_LIKE_STR;
+        func_name_length = SPIDER_SQL_NOT_LIKE_LEN;
+      }
+      else
       {
-         if (((Item_func_like *)item_func)->get_negated())
-         {
-            func_name = SPIDER_SQL_NOT_LIKE_STR;
-            func_name_length = SPIDER_SQL_NOT_LIKE_LEN;
-         }
-         else
-         {
-           LEX_CSTRING org_func_name= item_func->func_name_cstring();
-           func_name = org_func_name.str;
-           func_name_length = org_func_name.length;
-         }
+        org_func_name= item_func->func_name_cstring();
+        func_name = org_func_name.str;
+        func_name_length = org_func_name.length;
       }
       break;
-#else
-      DBUG_RETURN(ER_SPIDER_COND_SKIP_NUM);
-#endif
     case Item_func::CASE_SEARCHED_FUNC:
     case Item_func::CASE_SIMPLE_FUNC:
-#ifdef ITEM_FUNC_CASE_PARAMS_ARE_PUBLIC
-      Item_func_case *item_func_case = (Item_func_case *) item_func;
-      if (str)
-      {
-        if (str->reserve(SPIDER_SQL_CASE_LEN))
-          DBUG_RETURN(HA_ERR_OUT_OF_MEM);
-        str->q_append(SPIDER_SQL_CASE_STR, SPIDER_SQL_CASE_LEN);
-      }
-      if (item_func_case->first_expr_num != -1)
-      {
-        if ((error_num = spider_db_print_item_type(
-          item_list[item_func_case->first_expr_num], NULL, spider, str,
-          alias, alias_length, dbton_id, use_fields, fields)))
-          DBUG_RETURN(error_num);
-      }
-      for (roop_count = 0; roop_count < item_func_case->ncases;
-        roop_count += 2)
-      {
-        if (str)
-        {
-          if (str->reserve(SPIDER_SQL_WHEN_LEN))
-            DBUG_RETURN(HA_ERR_OUT_OF_MEM);
-          str->q_append(SPIDER_SQL_WHEN_STR, SPIDER_SQL_WHEN_LEN);
-        }
-        if ((error_num = spider_db_print_item_type(
-          item_list[roop_count], NULL, spider, str,
-          alias, alias_length, dbton_id, use_fields, fields)))
-          DBUG_RETURN(error_num);
-        if (str)
-        {
-          if (str->reserve(SPIDER_SQL_THEN_LEN))
-            DBUG_RETURN(HA_ERR_OUT_OF_MEM);
-          str->q_append(SPIDER_SQL_THEN_STR, SPIDER_SQL_THEN_LEN);
-        }
-        if ((error_num = spider_db_print_item_type(
-          item_list[roop_count + 1], NULL, spider, str,
-          alias, alias_length, dbton_id, use_fields, fields)))
-          DBUG_RETURN(error_num);
-      }
-      if (item_func_case->else_expr_num != -1)
-      {
-        if (str)
-        {
-          if (str->reserve(SPIDER_SQL_ELSE_LEN))
-            DBUG_RETURN(HA_ERR_OUT_OF_MEM);
-          str->q_append(SPIDER_SQL_ELSE_STR, SPIDER_SQL_ELSE_LEN);
-        }
-        if ((error_num = spider_db_print_item_type(
-          item_list[item_func_case->else_expr_num], NULL, spider, str,
-          alias, alias_length, dbton_id, use_fields, fields)))
-          DBUG_RETURN(error_num);
-      }
-      if (str)
-      {
-        if (str->reserve(SPIDER_SQL_END_LEN + SPIDER_SQL_CLOSE_PAREN_LEN))
-          DBUG_RETURN(HA_ERR_OUT_OF_MEM);
-        str->q_append(SPIDER_SQL_END_STR, SPIDER_SQL_END_LEN);
-        str->q_append(SPIDER_SQL_CLOSE_PAREN_STR,
-          SPIDER_SQL_CLOSE_PAREN_LEN);
-      }
-      DBUG_RETURN(0);
-#else
       DBUG_RETURN(ER_SPIDER_COND_SKIP_NUM);
-#endif
     case Item_func::JSON_EXTRACT_FUNC:
       func_name = (char*) item_func->func_name();
       func_name_length = strlen(func_name);
-      if (str)
-      {
-        if (str->reserve(func_name_length + SPIDER_SQL_OPEN_PAREN_LEN))
-          DBUG_RETURN(HA_ERR_OUT_OF_MEM);
-        str->q_append(func_name, func_name_length);
-        str->q_append(SPIDER_SQL_OPEN_PAREN_STR, SPIDER_SQL_OPEN_PAREN_LEN);
-      }
+      if (str->reserve(func_name_length + SPIDER_SQL_OPEN_PAREN_LEN))
+        DBUG_RETURN(HA_ERR_OUT_OF_MEM);
+      str->q_append(func_name, func_name_length);
+      str->q_append(SPIDER_SQL_OPEN_PAREN_STR, SPIDER_SQL_OPEN_PAREN_LEN);
       func_name = SPIDER_SQL_COMMA_STR;
       func_name_length = SPIDER_SQL_COMMA_LEN;
       separator_str = SPIDER_SQL_COMMA_STR;
@@ -6911,12 +6795,9 @@ int spider_db_mbase_util::open_item_func(
       if (spider_param_skip_default_condition(thd,
         share->skip_default_condition))
         DBUG_RETURN(ER_SPIDER_COND_SKIP_NUM);
-      if (str)
-      {
-        LEX_CSTRING org_func_name= item_func->func_name_cstring();
-        func_name = org_func_name.str;
-        func_name_length = org_func_name.length;
-      }
+      org_func_name= item_func->func_name_cstring();
+      func_name = org_func_name.str;
+      func_name_length = org_func_name.length;
       break;
   }
   DBUG_PRINT("info",("spider func_name = %s", func_name));
@@ -6949,14 +6830,11 @@ int spider_db_mbase_util::open_item_func(
         func_name = separator_str;
         func_name_length = separator_str_length;
       }
-      if (str)
-      {
-        if (str->reserve(func_name_length + SPIDER_SQL_SPACE_LEN * 2))
-          DBUG_RETURN(HA_ERR_OUT_OF_MEM);
-        str->q_append(SPIDER_SQL_SPACE_STR, SPIDER_SQL_SPACE_LEN);
-        str->q_append(func_name, func_name_length);
-        str->q_append(SPIDER_SQL_SPACE_STR, SPIDER_SQL_SPACE_LEN);
-      }
+      if (str->reserve(func_name_length + SPIDER_SQL_SPACE_LEN * 2))
+        DBUG_RETURN(HA_ERR_OUT_OF_MEM);
+      str->q_append(SPIDER_SQL_SPACE_STR, SPIDER_SQL_SPACE_LEN);
+      str->q_append(func_name, func_name_length);
+      str->q_append(SPIDER_SQL_SPACE_STR, SPIDER_SQL_SPACE_LEN);
     }
 
     /* Print the last operand value */
@@ -6969,61 +6847,49 @@ int spider_db_mbase_util::open_item_func(
   if (item_func->functype() == Item_func::FT_FUNC)
   {
     Item_func_match *item_func_match = (Item_func_match *)item_func;
-    if (str)
-    {
-      if (str->reserve(SPIDER_SQL_AGAINST_LEN))
-        DBUG_RETURN(HA_ERR_OUT_OF_MEM);
-      str->q_append(SPIDER_SQL_AGAINST_STR, SPIDER_SQL_AGAINST_LEN);
-    }
+    if (str->reserve(SPIDER_SQL_AGAINST_LEN))
+      DBUG_RETURN(HA_ERR_OUT_OF_MEM);
+    str->q_append(SPIDER_SQL_AGAINST_STR, SPIDER_SQL_AGAINST_LEN);
     item = item_list[0];
     if ((error_num = spider_db_print_item_type(item, NULL, spider, str,
       alias, alias_length, dbton_id, use_fields, fields)))
       DBUG_RETURN(error_num);
-    if (str)
-    {
-      if (str->reserve(
-        ((item_func_match->match_flags & FT_BOOL) ?
-          SPIDER_SQL_IN_BOOLEAN_MODE_LEN : 0) +
-        ((item_func_match->match_flags & FT_EXPAND) ?
-          SPIDER_SQL_WITH_QUERY_EXPANSION_LEN : 0)
-      ))
-        DBUG_RETURN(HA_ERR_OUT_OF_MEM);
-      if (item_func_match->match_flags & FT_BOOL)
-        str->q_append(SPIDER_SQL_IN_BOOLEAN_MODE_STR,
-          SPIDER_SQL_IN_BOOLEAN_MODE_LEN);
-      if (item_func_match->match_flags & FT_EXPAND)
-        str->q_append(SPIDER_SQL_WITH_QUERY_EXPANSION_STR,
-          SPIDER_SQL_WITH_QUERY_EXPANSION_LEN);
-    }
+    if (str->reserve(
+      ((item_func_match->match_flags & FT_BOOL) ?
+        SPIDER_SQL_IN_BOOLEAN_MODE_LEN : 0) +
+      ((item_func_match->match_flags & FT_EXPAND) ?
+        SPIDER_SQL_WITH_QUERY_EXPANSION_LEN : 0)
+    ))
+      DBUG_RETURN(HA_ERR_OUT_OF_MEM);
+    if (item_func_match->match_flags & FT_BOOL)
+      str->q_append(SPIDER_SQL_IN_BOOLEAN_MODE_STR,
+        SPIDER_SQL_IN_BOOLEAN_MODE_LEN);
+    if (item_func_match->match_flags & FT_EXPAND)
+      str->q_append(SPIDER_SQL_WITH_QUERY_EXPANSION_STR,
+        SPIDER_SQL_WITH_QUERY_EXPANSION_LEN);
   } else if (item_func->functype() == Item_func::UNKNOWN_FUNC)
   {
     if (
       func_name_length == 7 &&
       !strncasecmp("convert", func_name, func_name_length)
     ) {
-      if (str)
-      {
-        Item_func_conv_charset *item_func_conv_charset =
-          (Item_func_conv_charset *)item_func;
-        CHARSET_INFO *conv_charset =
-          item_func_conv_charset->SPIDER_Item_func_conv_charset_conv_charset;
-        uint cset_length = conv_charset->cs_name.length;
-        if (str->reserve(SPIDER_SQL_USING_LEN + cset_length))
-          DBUG_RETURN(HA_ERR_OUT_OF_MEM);
-        str->q_append(SPIDER_SQL_USING_STR, SPIDER_SQL_USING_LEN);
-        str->q_append(conv_charset->cs_name.str, cset_length);
-      }
+      Item_func_conv_charset *item_func_conv_charset =
+        (Item_func_conv_charset *)item_func;
+      CHARSET_INFO *conv_charset =
+        item_func_conv_charset->SPIDER_Item_func_conv_charset_conv_charset;
+      uint cset_length = conv_charset->cs_name.length;
+      if (str->reserve(SPIDER_SQL_USING_LEN + cset_length))
+        DBUG_RETURN(HA_ERR_OUT_OF_MEM);
+      str->q_append(SPIDER_SQL_USING_STR, SPIDER_SQL_USING_LEN);
+      str->q_append(conv_charset->cs_name.str, cset_length);
     }
   }
-  if (str)
-  {
-    if (merge_func)
-      str->length(str->length() - SPIDER_SQL_CLOSE_PAREN_LEN);
-    if (str->reserve(last_str_length + SPIDER_SQL_CLOSE_PAREN_LEN))
-      DBUG_RETURN(HA_ERR_OUT_OF_MEM);
-    str->q_append(last_str, last_str_length);
-    str->q_append(SPIDER_SQL_CLOSE_PAREN_STR, SPIDER_SQL_CLOSE_PAREN_LEN);
-  }
+  if (merge_func)
+    str->length(str->length() - SPIDER_SQL_CLOSE_PAREN_LEN);
+  if (str->reserve(last_str_length + SPIDER_SQL_CLOSE_PAREN_LEN))
+    DBUG_RETURN(HA_ERR_OUT_OF_MEM);
+  str->q_append(last_str, last_str_length);
+  str->q_append(SPIDER_SQL_CLOSE_PAREN_STR, SPIDER_SQL_CLOSE_PAREN_LEN);
   DBUG_RETURN(0);
 }
 
diff --git a/storage/spider/spd_db_mysql.h b/storage/spider/spd_db_mysql.h
index af7b860f3f5..a1957016388 100644
--- a/storage/spider/spd_db_mysql.h
+++ b/storage/spider/spd_db_mysql.h
@@ -130,6 +130,25 @@ public:
     bool use_fields,
     spider_fields *fields
   );
+protected:
+  int check_item_func(
+    Item_func *item_func,
+    ha_spider *spider,
+    const char *alias,
+    uint alias_length,
+    bool use_fields,
+    spider_fields *fields
+  );
+  int print_item_func(
+    Item_func *item_func,
+    ha_spider *spider,
+    spider_string *str,
+    const char *alias,
+    uint alias_length,
+    bool use_fields,
+    spider_fields *fields
+  );
+public:
 #ifdef HANDLER_HAS_DIRECT_AGGREGATE
   int open_item_sum_func(
     Item_sum *item_sum,