Reduce usage of strlen()

Changes:
- To detect automatic strlen() I removed the methods in String that
  uses 'const char *' without a length:
  - String::append(const char*)
  - Binary_string(const char *str)
  - String(const char *str, CHARSET_INFO *cs)
  - append_for_single_quote(const char *)
  All usage of append(const char*) is changed to either use
  String::append(char), String::append(const char*, size_t length) or
  String::append(LEX_CSTRING)
- Added STRING_WITH_LEN() around constant string arguments to
  String::append()
- Added overflow argument to escape_string_for_mysql() and
  escape_quotes_for_mysql() instead of returning (size_t) -1 on overflow.
  This was needed as most usage of the above functions never tested the
  result for -1 and would have given wrong results or crashes in case
  of overflows.
- Added Item_func_or_sum::func_name_cstring(), which returns LEX_CSTRING.
  Changed all Item_func::func_name()'s to func_name_cstring()'s.
  The old Item_func_or_sum::func_name() is now an inline function that
  returns func_name_cstring().str.
- Changed Item::mode_name() and Item::func_name_ext() to return
  LEX_CSTRING.
- Changed for some functions the name argument from const char * to
  to const LEX_CSTRING &:
  - Item::Item_func_fix_attributes()
  - Item::check_type_...()
  - Type_std_attributes::agg_item_collations()
  - Type_std_attributes::agg_item_set_converter()
  - Type_std_attributes::agg_arg_charsets...()
  - Type_handler_hybrid_field_type::aggregate_for_result()
  - Type_handler_geometry::check_type_geom_or_binary()
  - Type_handler::Item_func_or_sum_illegal_param()
  - Predicant_to_list_comparator::add_value_skip_null()
  - Predicant_to_list_comparator::add_value()
  - cmp_item_row::prepare_comparators()
  - cmp_item_row::aggregate_row_elements_for_comparison()
  - Cursor_ref::print_func()
- Removes String_space() as it was only used in one cases and that
  could be simplified to not use String_space(), thanks to the fixed
  my_vsnprintf().
- Added some const LEX_CSTRING's for common strings:
  - NULL_clex_str, DATA_clex_str, INDEX_clex_str.
- Changed primary_key_name to a LEX_CSTRING
- Renamed String::set_quick() to String::set_buffer_if_not_allocated() to
  clarify what the function really does.
- Rename of protocol function:
  bool store(const char *from, CHARSET_INFO *cs) to
  bool store_string_or_null(const char *from, CHARSET_INFO *cs).
  This was done to both clarify the difference between this 'store' function
  and also to make it easier to find unoptimal usage of store() calls.
- Added Protocol::store(const LEX_CSTRING*, CHARSET_INFO*)
- Changed some 'const char*' arrays to instead be of type LEX_CSTRING.
- class Item_func_units now used LEX_CSTRING for name.

Other things:
- Fixed a bug in mysql.cc:construct_prompt() where a wrong escape character
  in the prompt would cause some part of the prompt to be duplicated.
- Fixed a lot of instances where the length of the argument to
  append is known or easily obtain but was not used.
- Removed some not needed 'virtual' definition for functions that was
  inherited from the parent. I added override to these.
- Fixed Ordered_key::print() to preallocate needed buffer. Old code could
  case memory overruns.
- Simplified some loops when adding char * to a String with delimiters.

8 files changed, 208 insertions, 130 deletions

diff --git a/storage/spider/hs_client/config.hpp b/storage/spider/hs_client/config.hpp
index 2880f2f5a33..6d85c7e3d7c 100644
--- a/storage/spider/hs_client/config.hpp
+++ b/storage/spider/hs_client/config.hpp
@@ -60,7 +60,7 @@ struct config {
   conf_param *find(const String& key) const;
   conf_param *find(const char *key) const;
   String get_str(const String& key, const String& def =
-    String("", &my_charset_bin)) const;
+    String("", 0, &my_charset_bin)) const;
   String get_str(const char *key, const char *def = "") const;
   long long get_int(const String& key, long long def = 0) const;
   long long get_int(const char *key, long long def = 0) const;
diff --git a/storage/spider/hs_client/hstcpcli.cpp b/storage/spider/hs_client/hstcpcli.cpp
index 4c93b5a3a49..b3dea208f8f 100644
--- a/storage/spider/hs_client/hstcpcli.cpp
+++ b/storage/spider/hs_client/hstcpcli.cpp
@@ -196,9 +196,9 @@ hstcpcli::read_more()
         errno = 0;
         continue;
       }
-      error_str = String("read: failed", &my_charset_bin);
+      error_str = String(STRING_WITH_LEN("read: failed"), &my_charset_bin);
     } else {
-      error_str = String("read: eof", &my_charset_bin);
+      error_str = String(STRING_WITH_LEN("read: eof"), &my_charset_bin);
     }
     return rlen;
   }
@@ -503,7 +503,7 @@ hstcpcli::response_recv(size_t& num_flds_r)
     char *const err_end = start;
     String e = String(err_begin, (uint32)(err_end - err_begin), &my_charset_bin);
     if (!e.length()) {
-      e = String("unknown_error", &my_charset_bin);
+      e = String(STRING_WITH_LEN("unknown_error"), &my_charset_bin);
     }
     return set_error(resp_code, e);
   }
diff --git a/storage/spider/hs_client/socket.cpp b/storage/spider/hs_client/socket.cpp
index 45b8100e64c..e4541ce7273 100644
--- a/storage/spider/hs_client/socket.cpp
+++ b/storage/spider/hs_client/socket.cpp
@@ -63,7 +63,8 @@ socket_args::set(const config& conf)
     } else {
       const char *nd = !node.length() ? 0 : node.c_ptr();
       if (resolve(nd, port.c_ptr()) != 0) {
-        String message("getaddrinfo failed: ", &my_charset_bin);
+        String message(STRING_WITH_LEN("getaddrinfo failed: "),
+                       &my_charset_bin);
         message.reserve(node.length() + sizeof(":") - 1 + port.length());
         message.append(node);
         message.q_append(":", sizeof(":") - 1);
diff --git a/storage/spider/spd_db_conn.cc b/storage/spider/spd_db_conn.cc
index 2305173ab00..ea7714f2002 100644
--- a/storage/spider/spd_db_conn.cc
+++ b/storage/spider/spd_db_conn.cc
@@ -9694,8 +9694,8 @@ int spider_db_open_item_cond(
   int error_num = 0;
   List_iterator_fast<Item> lif(*(item_cond->argument_list()));
   Item *item;
-  char *func_name = NULL;
-  int func_name_length = 0, restart_pos = 0;
+  LEX_CSTRING func_name= {0,0};
+  int restart_pos = 0;
   DBUG_ENTER("spider_db_open_item_cond");
   if (str)
   {
@@ -9731,15 +9731,13 @@ restart_first:
     if (str)
     {
       restart_pos = str->length();
-      if (!func_name)
-      {
-        func_name = (char*) item_cond->func_name();
-        func_name_length = strlen(func_name);
-      }
-      if (str->reserve(func_name_length + SPIDER_SQL_SPACE_LEN * 2))
+      if (!func_name.str)
+        func_name= item_cond->func_name_cstring();
+
+      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(func_name.str, func_name.length);
       str->q_append(SPIDER_SQL_SPACE_STR, SPIDER_SQL_SPACE_LEN);
     }
 
diff --git a/storage/spider/spd_db_handlersocket.cc b/storage/spider/spd_db_handlersocket.cc
index edc9ee33477..030201e61ae 100644
--- a/storage/spider/spd_db_handlersocket.cc
+++ b/storage/spider/spd_db_handlersocket.cc
@@ -2877,6 +2877,7 @@ int spider_db_handlersocket_util::open_item_func(
   int error_num;
   Item *item, **item_list = item_func->arguments();
   uint roop_count, item_count = item_func->argument_count(), start_item = 0;
+  LEX_CSTRING func_name_c;
   const char *func_name = SPIDER_SQL_NULL_CHAR_STR,
     *separator_str = SPIDER_SQL_NULL_CHAR_STR,
     *last_str = SPIDER_SQL_NULL_CHAR_STR;
@@ -2904,8 +2905,9 @@ int spider_db_handlersocket_util::open_item_func(
       last_str_length = SPIDER_SQL_IS_NOT_NULL_LEN;
       break;
     case Item_func::UNKNOWN_FUNC:
-      func_name = (char*) item_func->func_name();
-      func_name_length = strlen(func_name);
+      func_name_c =      item_func->func_name_cstring();
+      func_name =        func_name_c.str;
+      func_name_length = func_name_c.length;
       DBUG_PRINT("info",("spider func_name = %s", func_name));
       DBUG_PRINT("info",("spider func_name_length = %d", func_name_length));
       if (func_name_length == 1 &&
@@ -3104,11 +3106,13 @@ int spider_db_handlersocket_util::open_item_func(
             Item_func *ifunc = (Item_func *) item;
             if (ifunc->functype() == Item_func::UNKNOWN_FUNC)
             {
+              LEX_CSTRING child_func_name_c;
               const char *child_func_name;
               int child_func_name_length;
               DBUG_PRINT("info",("spider child is UNKNOWN_FUNC"));
-              child_func_name = (char*) ifunc->func_name();
-              child_func_name_length = strlen(child_func_name);
+              child_func_name_c =      ifunc->func_name_cstring();
+              child_func_name =        child_func_name_c.str;
+              child_func_name_length = child_func_name_c.length;
               DBUG_PRINT("info",("spider child func_name is %s", child_func_name));
               if (
                 child_func_name_length == 10 &&
@@ -3142,11 +3146,13 @@ int spider_db_handlersocket_util::open_item_func(
             Item_func *ifunc = (Item_func *) item;
             if (ifunc->functype() == Item_func::UNKNOWN_FUNC)
             {
+              LEX_CSTRING child_func_name_c;
               const char *child_func_name;
               int child_func_name_length;
               DBUG_PRINT("info",("spider child is UNKNOWN_FUNC"));
-              child_func_name = (char*) ifunc->func_name();
-              child_func_name_length = strlen(child_func_name);
+              child_func_name_c =      ifunc->func_name_cstring();
+              child_func_name =        child_func_name_c.str;
+              child_func_name_length = child_func_name_c.length;
               DBUG_PRINT("info",("spider child func_name is %s", child_func_name));
               if (
                 child_func_name_length == 10 &&
@@ -3276,11 +3282,13 @@ int spider_db_handlersocket_util::open_item_func(
             Item_func *ifunc = (Item_func *) item;
             if (ifunc->functype() == Item_func::UNKNOWN_FUNC)
             {
+              LEX_CSTRING child_func_name_c;
               const char *child_func_name;
               int child_func_name_length;
               DBUG_PRINT("info",("spider child is UNKNOWN_FUNC"));
-              child_func_name = (char*) ifunc->func_name();
-              child_func_name_length = strlen(child_func_name);
+              child_func_name_c =      ifunc->func_name_cstring();
+              child_func_name =        child_func_name_c.str;
+              child_func_name_length = child_func_name_c.length;
               DBUG_PRINT("info",("spider child func_name is %s", child_func_name));
               if (
                 child_func_name_length == 10 &&
@@ -3330,11 +3338,13 @@ int spider_db_handlersocket_util::open_item_func(
             Item_func *ifunc = (Item_func *) item;
             if (ifunc->functype() == Item_func::UNKNOWN_FUNC)
             {
+              LEX_CSTRING child_func_name_c;
               const char *child_func_name;
               int child_func_name_length;
               DBUG_PRINT("info",("spider child is UNKNOWN_FUNC"));
-              child_func_name = (char*) ifunc->func_name();
-              child_func_name_length = strlen(child_func_name);
+              child_func_name_c =      ifunc->func_name_cstring();
+              child_func_name =        child_func_name_c.str;
+              child_func_name_length = child_func_name_c.length;
               DBUG_PRINT("info",("spider child func_name is %s", child_func_name));
               if (
                 child_func_name_length == 10 &&
@@ -3371,11 +3381,13 @@ int spider_db_handlersocket_util::open_item_func(
             Item_func *ifunc = (Item_func *) item;
             if (ifunc->functype() == Item_func::UNKNOWN_FUNC)
             {
+              LEX_CSTRING child_func_name_c;
               const char *child_func_name;
               int child_func_name_length;
               DBUG_PRINT("info",("spider child is UNKNOWN_FUNC"));
-              child_func_name = (char*) ifunc->func_name();
-              child_func_name_length = strlen(child_func_name);
+              child_func_name_c =      ifunc->func_name_cstring();
+              child_func_name =        child_func_name_c.str;
+              child_func_name_length = child_func_name_c.length;
               DBUG_PRINT("info",("spider child func_name is %s", child_func_name));
               if (
                 child_func_name_length == 10 &&
@@ -3410,11 +3422,13 @@ int spider_db_handlersocket_util::open_item_func(
             Item_func *ifunc = (Item_func *) item;
             if (ifunc->functype() == Item_func::UNKNOWN_FUNC)
             {
+              LEX_CSTRING child_func_name_c;
               const char *child_func_name;
               int child_func_name_length;
               DBUG_PRINT("info",("spider child is UNKNOWN_FUNC"));
-              child_func_name = (char*) ifunc->func_name();
-              child_func_name_length = strlen(child_func_name);
+              child_func_name_c =      ifunc->func_name_cstring();
+              child_func_name =        child_func_name_c.str;
+              child_func_name_length = child_func_name_c.length;
               DBUG_PRINT("info",("spider child func_name is %s", child_func_name));
               if (
                 child_func_name_length == 10 &&
@@ -3465,11 +3479,13 @@ int spider_db_handlersocket_util::open_item_func(
             Item_func *ifunc = (Item_func *) item;
             if (ifunc->functype() == Item_func::UNKNOWN_FUNC)
             {
+              LEX_CSTRING child_func_name_c;
               const char *child_func_name;
               int child_func_name_length;
               DBUG_PRINT("info",("spider child is UNKNOWN_FUNC"));
-              child_func_name = (char*) ifunc->func_name();
-              child_func_name_length = strlen(child_func_name);
+              child_func_name_c =      ifunc->func_name_cstring();
+              child_func_name =        child_func_name_c.str;
+              child_func_name_length = child_func_name_c.length;
               DBUG_PRINT("info",("spider child func_name is %s", child_func_name));
               if (
                 child_func_name_length == 10 &&
@@ -3564,11 +3580,13 @@ int spider_db_handlersocket_util::open_item_func(
           Item_func *ifunc = (Item_func *) item;
           if (ifunc->functype() == Item_func::UNKNOWN_FUNC)
           {
+            LEX_CSTRING child_func_name_c;
             const char *child_func_name;
             int child_func_name_length;
             DBUG_PRINT("info",("spider child is UNKNOWN_FUNC"));
-            child_func_name = (char*) ifunc->func_name();
-            child_func_name_length = strlen(child_func_name);
+            child_func_name_c =      ifunc->func_name_cstring();
+            child_func_name =        child_func_name_c.str;
+            child_func_name_length = child_func_name_c.length;
             DBUG_PRINT("info",("spider child func_name is %s", child_func_name));
             if (
               child_func_name_length == 10 &&
@@ -3654,8 +3672,9 @@ int spider_db_handlersocket_util::open_item_func(
       }
       if (str)
       {
-        func_name = (char*) item_func->func_name();
-        func_name_length = strlen(func_name);
+        func_name_c =      item_func->func_name_cstring();
+        func_name =        func_name_c.str;
+        func_name_length = func_name_c.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);
@@ -3665,8 +3684,9 @@ int spider_db_handlersocket_util::open_item_func(
     case Item_func::NEG_FUNC:
       if (str)
       {
-        func_name = (char*) item_func->func_name();
-        func_name_length = strlen(func_name);
+        func_name_c =      item_func->func_name_cstring();
+        func_name =        func_name_c.str;
+        func_name_length = func_name_c.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);
@@ -3699,8 +3719,9 @@ int spider_db_handlersocket_util::open_item_func(
         separator_str = SPIDER_SQL_AND_STR;
         separator_str_length = SPIDER_SQL_AND_LEN;
       } else {
-        func_name = (char*) item_func->func_name();
-        func_name_length = strlen(func_name);
+        func_name_c =      item_func->func_name_cstring();
+        func_name =        func_name_c.str;
+        func_name_length = func_name_c.length;
         separator_str = SPIDER_SQL_AND_STR;
         separator_str_length = SPIDER_SQL_AND_LEN;
       }
@@ -3712,8 +3733,9 @@ int spider_db_handlersocket_util::open_item_func(
         DBUG_RETURN(ER_SPIDER_COND_SKIP_NUM);
       if (str)
       {
-        func_name = (char*) item_func->func_name();
-        func_name_length = strlen(func_name);
+        func_name_c =      item_func->func_name_cstring();
+        func_name =        func_name_c.str;
+        func_name_length = func_name_c.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))
@@ -3791,8 +3813,9 @@ int spider_db_handlersocket_util::open_item_func(
     case Item_func::SP_OVERLAPS_FUNC:
       if (str)
       {
-        func_name = (char*) item_func->func_name();
-        func_name_length = strlen(func_name);
+        func_name_c =      item_func->func_name_cstring();
+        func_name =        func_name_c.str;
+        func_name_length = func_name_c.length;
         DBUG_PRINT("info",("spider func_name = %s", func_name));
         DBUG_PRINT("info",("spider func_name_length = %d", func_name_length));
         if (str->reserve(
@@ -3824,8 +3847,9 @@ int spider_db_handlersocket_util::open_item_func(
     case Item_func::LIKE_FUNC:
       if (str)
       {
-        func_name = (char*) item_func->func_name();
-        func_name_length = strlen(func_name);
+        func_name_c =      item_func->func_name_cstring();
+        func_name =        func_name_c.str;
+        func_name_length = func_name_c.length;
       }
       break;
     default:
@@ -3836,8 +3860,9 @@ int spider_db_handlersocket_util::open_item_func(
         DBUG_RETURN(ER_SPIDER_COND_SKIP_NUM);
       if (str)
       {
-        func_name = (char*) item_func->func_name();
-        func_name_length = strlen(func_name);
+        func_name_c =      item_func->func_name_cstring();
+        func_name =        func_name_c.str;
+        func_name_length = func_name_c.length;
       }
       break;
   }
@@ -3958,8 +3983,9 @@ int spider_db_handlersocket_util::open_item_sum_func(
     case Item_sum::MIN_FUNC:
     case Item_sum::MAX_FUNC:
       {
-        const char *func_name = item_sum->func_name();
-        uint func_name_length = strlen(func_name);
+        LEX_CSTRING func_name_c = item_sum->func_name_cstring();
+        const char *func_name =   func_name_c.str;
+        uint func_name_length =   func_name_c.length;
         Item *item, **args = item_sum->get_args();
         if (str)
         {
diff --git a/storage/spider/spd_db_mysql.cc b/storage/spider/spd_db_mysql.cc
index 6821e36e445..5b257444bfc 100644
--- a/storage/spider/spd_db_mysql.cc
+++ b/storage/spider/spd_db_mysql.cc
@@ -3825,13 +3825,14 @@ size_t spider_db_mbase::escape_string(
   const char *from,
   size_t from_length
 ) {
+  my_bool overflow;
   DBUG_ENTER("spider_db_mbase::escape_string");
   DBUG_PRINT("info",("spider this=%p", this));
   if (db_conn->server_status & SERVER_STATUS_NO_BACKSLASH_ESCAPES)
     DBUG_RETURN(escape_quotes_for_mysql(db_conn->charset, to, 0,
-      from, from_length));
+      from, from_length, &overflow));
   DBUG_RETURN(escape_string_for_mysql(db_conn->charset, to, 0,
-    from, from_length));
+    from, from_length, &overflow));
 }
 
 bool spider_db_mbase::have_lock_table_list()
@@ -5799,6 +5800,8 @@ int spider_db_mbase_util::open_item_func(
   Item *item, **item_list = item_func->arguments();
   Field *field;
   uint roop_count, item_count = item_func->argument_count(), start_item = 0;
+  LEX_CSTRING org_func_name= {SPIDER_SQL_NULL_CHAR_STR,
+                              SPIDER_SQL_NULL_CHAR_LEN};
   const char *func_name = SPIDER_SQL_NULL_CHAR_STR,
     *separator_str = SPIDER_SQL_NULL_CHAR_STR,
     *last_str = SPIDER_SQL_NULL_CHAR_STR;
@@ -5826,8 +5829,9 @@ int spider_db_mbase_util::open_item_func(
       last_str_length = SPIDER_SQL_IS_NOT_NULL_LEN;
       break;
     case Item_func::UNKNOWN_FUNC:
-      func_name = (char*) item_func->func_name();
-      func_name_length = strlen(func_name);
+      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 (func_name_length == 1 &&
@@ -6028,9 +6032,10 @@ 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();
               DBUG_PRINT("info",("spider child is UNKNOWN_FUNC"));
-              child_func_name = (char*) ifunc->func_name();
-              child_func_name_length = strlen(child_func_name);
+              child_func_name = org_func_name.str;
+              child_func_name_length =  org_func_name.length;
               DBUG_PRINT("info",("spider child func_name is %s", child_func_name));
               if (
                 child_func_name_length == 10 &&
@@ -6066,9 +6071,10 @@ 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();
               DBUG_PRINT("info",("spider child is UNKNOWN_FUNC"));
-              child_func_name = (char*) ifunc->func_name();
-              child_func_name_length = strlen(child_func_name);
+              child_func_name = org_func_name.str;
+              child_func_name_length =  org_func_name.length;
               DBUG_PRINT("info",("spider child func_name is %s", child_func_name));
               if (
                 child_func_name_length == 10 &&
@@ -6200,9 +6206,10 @@ 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();
               DBUG_PRINT("info",("spider child is UNKNOWN_FUNC"));
-              child_func_name = (char*) ifunc->func_name();
-              child_func_name_length = strlen(child_func_name);
+              child_func_name = org_func_name.str;
+              child_func_name_length =  org_func_name.length;
               DBUG_PRINT("info",("spider child func_name is %s", child_func_name));
               if (
                 child_func_name_length == 10 &&
@@ -6254,9 +6261,10 @@ 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();
               DBUG_PRINT("info",("spider child is UNKNOWN_FUNC"));
-              child_func_name = (char*) ifunc->func_name();
-              child_func_name_length = strlen(child_func_name);
+              child_func_name = org_func_name.str;
+              child_func_name_length =  org_func_name.length;
               DBUG_PRINT("info",("spider child func_name is %s", child_func_name));
               if (
                 child_func_name_length == 10 &&
@@ -6295,9 +6303,10 @@ 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();
               DBUG_PRINT("info",("spider child is UNKNOWN_FUNC"));
-              child_func_name = (char*) ifunc->func_name();
-              child_func_name_length = strlen(child_func_name);
+              child_func_name = org_func_name.str;
+              child_func_name_length =  org_func_name.length;
               DBUG_PRINT("info",("spider child func_name is %s", child_func_name));
               if (
                 child_func_name_length == 10 &&
@@ -6334,9 +6343,10 @@ 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();
               DBUG_PRINT("info",("spider child is UNKNOWN_FUNC"));
-              child_func_name = (char*) ifunc->func_name();
-              child_func_name_length = strlen(child_func_name);
+              child_func_name = org_func_name.str;
+              child_func_name_length =  org_func_name.length;
               DBUG_PRINT("info",("spider child func_name is %s", child_func_name));
               if (
                 child_func_name_length == 10 &&
@@ -6389,9 +6399,10 @@ 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();
               DBUG_PRINT("info",("spider child is UNKNOWN_FUNC"));
-              child_func_name = (char*) ifunc->func_name();
-              child_func_name_length = strlen(child_func_name);
+              child_func_name = org_func_name.str;
+              child_func_name_length =  org_func_name.length;
               DBUG_PRINT("info",("spider child func_name is %s", child_func_name));
               if (
                 child_func_name_length == 10 &&
@@ -6488,9 +6499,10 @@ 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();
             DBUG_PRINT("info",("spider child is UNKNOWN_FUNC"));
-            child_func_name = (char*) ifunc->func_name();
-            child_func_name_length = strlen(child_func_name);
+            child_func_name = org_func_name.str;
+            child_func_name_length =  org_func_name.length;
             DBUG_PRINT("info",("spider child func_name is %s", child_func_name));
             if (
               child_func_name_length == 10 &&
@@ -6576,8 +6588,9 @@ int spider_db_mbase_util::open_item_func(
       }
       if (str)
       {
-        func_name = (char*) item_func->func_name();
-        func_name_length = strlen(func_name);
+        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);
@@ -6587,8 +6600,9 @@ int spider_db_mbase_util::open_item_func(
     case Item_func::NEG_FUNC:
       if (str)
       {
-        func_name = (char*) item_func->func_name();
-        func_name_length = strlen(func_name);
+        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);
@@ -6621,8 +6635,9 @@ int spider_db_mbase_util::open_item_func(
         separator_str = SPIDER_SQL_AND_STR;
         separator_str_length = SPIDER_SQL_AND_LEN;
       } else {
-        func_name = (char*) item_func->func_name();
-        func_name_length = strlen(func_name);
+        LEX_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;
         separator_str_length = SPIDER_SQL_AND_LEN;
       }
@@ -6635,8 +6650,9 @@ int spider_db_mbase_util::open_item_func(
         DBUG_RETURN(ER_SPIDER_COND_SKIP_NUM);
       if (str)
       {
-        func_name = (char*) item_func->func_name();
-        func_name_length = strlen(func_name);
+        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))
@@ -6714,8 +6730,9 @@ int spider_db_mbase_util::open_item_func(
     case Item_func::SP_OVERLAPS_FUNC:
       if (str)
       {
-        func_name = (char*) item_func->func_name();
-        func_name_length = strlen(func_name);
+        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(
@@ -6746,8 +6763,9 @@ int spider_db_mbase_util::open_item_func(
     case Item_func::GT_FUNC:
       if (str)
       {
-        func_name = (char*) item_func->func_name();
-        func_name_length = strlen(func_name);
+        LEX_CSTRING 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:
@@ -6761,8 +6779,9 @@ int spider_db_mbase_util::open_item_func(
          }
          else
          {
-            func_name = (char*)item_func->func_name();
-            func_name_length = strlen(func_name);
+           LEX_CSTRING org_func_name= item_func->func_name_cstring();
+           func_name = org_func_name.str;
+           func_name_length = org_func_name.length;
          }
       }
       break;
@@ -6777,8 +6796,9 @@ int spider_db_mbase_util::open_item_func(
         DBUG_RETURN(ER_SPIDER_COND_SKIP_NUM);
       if (str)
       {
-        func_name = (char*) item_func->func_name();
-        func_name_length = strlen(func_name);
+        LEX_CSTRING org_func_name= item_func->func_name_cstring();
+        func_name = org_func_name.str;
+        func_name_length = org_func_name.length;
       }
       break;
   }
@@ -6911,8 +6931,9 @@ int spider_db_mbase_util::open_item_sum_func(
     case Item_sum::MIN_FUNC:
     case Item_sum::MAX_FUNC:
       {
-        const char *func_name = item_sum->func_name();
-        uint func_name_length = strlen(func_name);
+        LEX_CSTRING org_func_name= item_sum->func_name_cstring();
+        const char *func_name = org_func_name.str;
+        uint func_name_length = org_func_name.length;
         Item *item, **args = item_sum->get_args();
         if (str)
         {
@@ -6957,8 +6978,9 @@ int spider_db_mbase_util::open_item_sum_func(
       {
         if (!use_fields)
           DBUG_RETURN(ER_SPIDER_COND_SKIP_NUM);
-        const char *func_name = item_sum->func_name();
-        uint func_name_length = strlen(func_name);
+        LEX_CSTRING org_func_name= item_sum->func_name_cstring();
+        const char *func_name = org_func_name.str;
+        uint func_name_length = org_func_name.length;
         Item *item, **args = item_sum->get_args();
         if (str)
         {
diff --git a/storage/spider/spd_db_oracle.cc b/storage/spider/spd_db_oracle.cc
index 92b4556a198..77d3c808b70 100644
--- a/storage/spider/spd_db_oracle.cc
+++ b/storage/spider/spd_db_oracle.cc
@@ -3124,6 +3124,7 @@ int spider_db_oracle_util::open_item_func(
   int error_num;
   Item *item, **item_list = item_func->arguments();
   Field *field;
+  LEX_CSTRING func_name_c;
   uint roop_count, item_count = item_func->argument_count(), start_item = 0;
   const char *func_name = SPIDER_SQL_NULL_CHAR_STR,
     *separator_str = SPIDER_SQL_NULL_CHAR_STR,
@@ -3152,8 +3153,9 @@ int spider_db_oracle_util::open_item_func(
       last_str_length = SPIDER_SQL_IS_NOT_NULL_LEN;
       break;
     case Item_func::UNKNOWN_FUNC:
-      func_name = (char*) item_func->func_name();
-      func_name_length = strlen(func_name);
+      func_name_c =      item_func->func_name_cstring();
+      func_name =        func_name_c.str;
+      func_name_length = func_name_c.lengthstr;
       DBUG_PRINT("info",("spider func_name = %s", func_name));
       DBUG_PRINT("info",("spider func_name_length = %d", func_name_length));
       if (func_name_length == 1 &&
@@ -3352,11 +3354,13 @@ int spider_db_oracle_util::open_item_func(
             Item_func *ifunc = (Item_func *) item;
             if (ifunc->functype() == Item_func::UNKNOWN_FUNC)
             {
+              LEX_CSTRING child_func_name_c;
               const char *child_func_name;
               int child_func_name_length;
               DBUG_PRINT("info",("spider child is UNKNOWN_FUNC"));
-              child_func_name = (char*) ifunc->func_name();
-              child_func_name_length = strlen(child_func_name);
+              child_func_name_c =      ifunc->func_name_cstring();
+              child_func_name =        child_func_name_c.str;
+              child_func_name_length = child_func_name_c.length;
               DBUG_PRINT("info",("spider child func_name is %s", child_func_name));
               if (
                 child_func_name_length == 10 &&
@@ -3390,11 +3394,13 @@ int spider_db_oracle_util::open_item_func(
             Item_func *ifunc = (Item_func *) item;
             if (ifunc->functype() == Item_func::UNKNOWN_FUNC)
             {
+              LEX_CSTRING child_func_name_c;
               const char *child_func_name;
               int child_func_name_length;
               DBUG_PRINT("info",("spider child is UNKNOWN_FUNC"));
-              child_func_name = (char*) ifunc->func_name();
-              child_func_name_length = strlen(child_func_name);
+              child_func_name_c =      ifunc->func_name_cstring();
+              child_func_name =        child_func_name_c.str;
+              child_func_name_length = child_func_name_c.length;
               DBUG_PRINT("info",("spider child func_name is %s", child_func_name));
               if (
                 child_func_name_length == 10 &&
@@ -3524,11 +3530,13 @@ int spider_db_oracle_util::open_item_func(
             Item_func *ifunc = (Item_func *) item;
             if (ifunc->functype() == Item_func::UNKNOWN_FUNC)
             {
+              LEX_CSTRING child_func_name_c;
               const char *child_func_name;
               int child_func_name_length;
               DBUG_PRINT("info",("spider child is UNKNOWN_FUNC"));
-              child_func_name = (char*) ifunc->func_name();
-              child_func_name_length = strlen(child_func_name);
+              child_func_name_c =      ifunc->func_name_cstring();
+              child_func_name =        child_func_name_c.str;
+              child_func_name_length = child_func_name_c.length;
               DBUG_PRINT("info",("spider child func_name is %s", child_func_name));
               if (
                 child_func_name_length == 10 &&
@@ -3578,11 +3586,13 @@ int spider_db_oracle_util::open_item_func(
             Item_func *ifunc = (Item_func *) item;
             if (ifunc->functype() == Item_func::UNKNOWN_FUNC)
             {
+              LEX_CSTRING child_func_name_c;
               const char *child_func_name;
               int child_func_name_length;
               DBUG_PRINT("info",("spider child is UNKNOWN_FUNC"));
-              child_func_name = (char*) ifunc->func_name();
-              child_func_name_length = strlen(child_func_name);
+              child_func_name_c =      ifunc->func_name_cstring();
+              child_func_name =        child_func_name_c.str;
+              child_func_name_length = child_func_name_c.length;
               DBUG_PRINT("info",("spider child func_name is %s", child_func_name));
               if (
                 child_func_name_length == 10 &&
@@ -3619,11 +3629,13 @@ int spider_db_oracle_util::open_item_func(
             Item_func *ifunc = (Item_func *) item;
             if (ifunc->functype() == Item_func::UNKNOWN_FUNC)
             {
+              LEX_CSTRING child_func_name_c;
               const char *child_func_name;
               int child_func_name_length;
               DBUG_PRINT("info",("spider child is UNKNOWN_FUNC"));
-              child_func_name = (char*) ifunc->func_name();
-              child_func_name_length = strlen(child_func_name);
+              child_func_name_c =      ifunc->func_name_cstring();
+              child_func_name =        child_func_name_c.str;
+              child_func_name_length = child_func_name_c.length;
               DBUG_PRINT("info",("spider child func_name is %s", child_func_name));
               if (
                 child_func_name_length == 10 &&
@@ -3658,11 +3670,13 @@ int spider_db_oracle_util::open_item_func(
             Item_func *ifunc = (Item_func *) item;
             if (ifunc->functype() == Item_func::UNKNOWN_FUNC)
             {
+              LEX_CSTRING child_func_name_c;
               const char *child_func_name;
               int child_func_name_length;
               DBUG_PRINT("info",("spider child is UNKNOWN_FUNC"));
-              child_func_name = (char*) ifunc->func_name();
-              child_func_name_length = strlen(child_func_name);
+              child_func_name_c =      ifunc->func_name_cstring();
+              child_func_name =        child_func_name_c.str;
+              child_func_name_length = child_func_name_c.length;
               DBUG_PRINT("info",("spider child func_name is %s", child_func_name));
               if (
                 child_func_name_length == 10 &&
@@ -3713,11 +3727,13 @@ int spider_db_oracle_util::open_item_func(
             Item_func *ifunc = (Item_func *) item;
             if (ifunc->functype() == Item_func::UNKNOWN_FUNC)
             {
+              LEX_CSTRING child_func_name_c;
               const char *child_func_name;
               int child_func_name_length;
               DBUG_PRINT("info",("spider child is UNKNOWN_FUNC"));
-              child_func_name = (char*) ifunc->func_name();
-              child_func_name_length = strlen(child_func_name);
+              child_func_name_c =      ifunc->func_name_cstring();
+              child_func_name =        child_func_name_c.str;
+              child_func_name_length = child_func_name_c.length;
               DBUG_PRINT("info",("spider child func_name is %s", child_func_name));
               if (
                 child_func_name_length == 10 &&
@@ -3948,11 +3964,13 @@ int spider_db_oracle_util::open_item_func(
           Item_func *ifunc = (Item_func *) item;
           if (ifunc->functype() == Item_func::UNKNOWN_FUNC)
           {
+            LEX_CSTRING child_func_name_c;
             const char *child_func_name;
             int child_func_name_length;
             DBUG_PRINT("info",("spider child is UNKNOWN_FUNC"));
-            child_func_name = (char*) ifunc->func_name();
-            child_func_name_length = strlen(child_func_name);
+            child_func_name_c =      ifunc->func_name_cstring();
+            child_func_name =        child_func_name_c.str;
+            child_func_name_length = child_func_name_c.length;
             DBUG_PRINT("info",("spider child func_name is %s", child_func_name));
             if (
               child_func_name_length == 10 &&
@@ -4038,8 +4056,9 @@ int spider_db_oracle_util::open_item_func(
       }
       if (str)
       {
-        func_name = (char*) item_func->func_name();
-        func_name_length = strlen(func_name);
+        func_name_c =      item_func->func_name_cstring();
+        func_name =        func_name_c.str;
+        func_name_length = func_name_c.lengthstr;
         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);
@@ -4049,8 +4068,9 @@ int spider_db_oracle_util::open_item_func(
     case Item_func::NEG_FUNC:
       if (str)
       {
-        func_name = (char*) item_func->func_name();
-        func_name_length = strlen(func_name);
+        func_name_c =      item_func->func_name_cstring();
+        func_name =        func_name_c.str;
+        func_name_length = func_name_c.lengthstr;
         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);
@@ -4083,8 +4103,9 @@ int spider_db_oracle_util::open_item_func(
         separator_str = SPIDER_SQL_AND_STR;
         separator_str_length = SPIDER_SQL_AND_LEN;
       } else {
-        func_name = (char*) item_func->func_name();
-        func_name_length = strlen(func_name);
+        func_name_c =      item_func->func_name_cstring();
+        func_name =        func_name_c.str;
+        func_name_length = func_name_c.lengthstr;
         separator_str = SPIDER_SQL_AND_STR;
         separator_str_length = SPIDER_SQL_AND_LEN;
       }
@@ -4097,8 +4118,9 @@ int spider_db_oracle_util::open_item_func(
         DBUG_RETURN(ER_SPIDER_COND_SKIP_NUM);
       if (str)
       {
-        func_name = (char*) item_func->func_name();
-        func_name_length = strlen(func_name);
+        func_name_c =      item_func->func_name_cstring();
+        func_name =        func_name_c.str;
+        func_name_length = func_name_c.lengthstr;
         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))
@@ -4176,8 +4198,9 @@ int spider_db_oracle_util::open_item_func(
     case Item_func::SP_OVERLAPS_FUNC:
       if (str)
       {
-        func_name = (char*) item_func->func_name();
-        func_name_length = strlen(func_name);
+        func_name_c =      item_func->func_name_cstring();
+        func_name =        func_name_c.str;
+        func_name_length = func_name_c.lengthstr;
         DBUG_PRINT("info",("spider func_name = %s", func_name));
         DBUG_PRINT("info",("spider func_name_length = %d", func_name_length));
         if (str->reserve(
@@ -4208,8 +4231,9 @@ int spider_db_oracle_util::open_item_func(
     case Item_func::GT_FUNC:
       if (str)
       {
-        func_name = (char*) item_func->func_name();
-        func_name_length = strlen(func_name);
+        func_name_c =      item_func->func_name_cstring();
+        func_name =        func_name_c.str;
+        func_name_length = func_name_c.lengthstr;
       }
       break;
     case Item_func::LIKE_FUNC:
@@ -4223,8 +4247,9 @@ int spider_db_oracle_util::open_item_func(
          }
          else
          {
-            func_name = (char*)item_func->func_name();
-            func_name_length = strlen(func_name);
+           func_name_c =      item_func->func_name_cstring();
+           func_name =        func_name_c.str;
+           func_name_length = func_name_c.lengthstr;
          }
       }
       break;
@@ -4239,8 +4264,9 @@ int spider_db_oracle_util::open_item_func(
         DBUG_RETURN(ER_SPIDER_COND_SKIP_NUM);
       if (str)
       {
-        func_name = (char*) item_func->func_name();
-        func_name_length = strlen(func_name);
+        func_name_c =      item_func->func_name_cstring();
+        func_name =        func_name_c.str;
+        func_name_length = func_name_c.lengthstr;
       }
       break;
   }
@@ -4366,8 +4392,9 @@ int spider_db_oracle_util::open_item_sum_func(
     case Item_sum::MIN_FUNC:
     case Item_sum::MAX_FUNC:
       {
-        const char *func_name = item_sum->func_name();
-        uint func_name_length = strlen(func_name);
+        LEX_CSTRING func_name_c= item_sum->func_name_cstring();
+        const char *func_name = func_name_c.str;
+        uint func_name_length = func_name_c.length;
         Item *item, **args = item_sum->get_args();
         if (str)
         {
@@ -4427,10 +4454,11 @@ size_t spider_db_oracle_util::escape_string(
   size_t from_length,
   CHARSET_INFO *access_charset
 ) {
+  my_bool overflow;
   DBUG_ENTER("spider_db_oracle::escape_string");
   DBUG_PRINT("info",("spider this=%p", this));
   DBUG_RETURN(escape_quotes_for_mysql(access_charset, to, 0,
-    from, from_length));
+    from, from_length, &overflow));
 }
 
 int spider_db_oracle_util::append_escaped_util(
diff --git a/storage/spider/spd_malloc.cc b/storage/spider/spd_malloc.cc
index d16574c6ac2..8a99e648afc 100644
--- a/storage/spider/spd_malloc.cc
+++ b/storage/spider/spd_malloc.cc
@@ -292,7 +292,7 @@ spider_string::spider_string(
 spider_string::spider_string(
   const char *str,
   CHARSET_INFO *cs
-) : str(str, cs), next(NULL)
+) : str(str, strlen(str), cs), next(NULL)
 {
   DBUG_ENTER("spider_string::spider_string");
   DBUG_PRINT("info",("spider this=%p", this));
@@ -853,7 +853,7 @@ bool spider_string::append(
   DBUG_ASSERT(mem_calc_inited);
   DBUG_ASSERT((!current_alloc_mem && !str.is_alloced()) ||
     current_alloc_mem == str.alloced_length());
-  bool res = str.append(s);
+  bool res = str.append(s, strlen(s));
   SPIDER_STRING_CALC_MEM;
   DBUG_RETURN(res);
 }
@@ -1216,13 +1216,15 @@ void spider_string::append_escape_string(
   const char *st,
   uint len
 ) {
+  my_bool overflow;
   DBUG_ENTER("spider_string::append_escape_string");
   DBUG_PRINT("info",("spider this=%p", this));
   DBUG_ASSERT(mem_calc_inited);
   DBUG_ASSERT((!current_alloc_mem && !str.is_alloced()) ||
     current_alloc_mem == str.alloced_length());
   str.length(str.length() + escape_string_for_mysql(
-    str.charset(), (char *) str.ptr() + str.length(), 0, st, len));
+    str.charset(), (char *) str.ptr() + str.length(), 0, st, len,
+                                                    &overflow));
   DBUG_VOID_RETURN;
 }
 
@@ -1231,13 +1233,14 @@ void spider_string::append_escape_string(
   uint len,
   CHARSET_INFO *cs
 ) {
+  my_bool overflow;
   DBUG_ENTER("spider_string::append_escape_string");
   DBUG_PRINT("info",("spider this=%p", this));
   DBUG_ASSERT(mem_calc_inited);
   DBUG_ASSERT((!current_alloc_mem && !str.is_alloced()) ||
     current_alloc_mem == str.alloced_length());
   str.length(str.length() + escape_string_for_mysql(
-    cs, (char *) str.ptr() + str.length(), 0, st, len));
+    cs, (char *) str.ptr() + str.length(), 0, st, len, &overflow));
   DBUG_VOID_RETURN;
 }
 
@@ -1286,7 +1289,7 @@ bool spider_string::append_for_single_quote(
   DBUG_ASSERT((!current_alloc_mem && !str.is_alloced()) ||
     current_alloc_mem == str.alloced_length());
 #ifdef SPIDER_HAS_APPEND_FOR_SINGLE_QUOTE
-  bool res = str.append_for_single_quote(st);
+  bool res = str.append_for_single_quote(st, strlen(st));
 #else
   String ststr(st, str.charset());
   bool res = append_escaped(&str, &ststr);