MDEV-27172 Prefix indices on Spider tables may lead to wrong query results

Spider converts HA_READ_KEY_EXACT to the equality (=) in the
function spider_db_append_key_where_internal() but the conversion
is not necessarily correct for tables with prefix indices.

We fix the bug by converting HA_READ_KEY_EXACT to 'LIKE "foo%"' when
a target key is a prefix key. The fix is partly inspired by FEDERATED.
See ha_federated::create_where_from_key() for more details.

7 files changed, 334 insertions, 251 deletions

diff --git a/storage/spider/mysql-test/spider/bugfix/r/mdev_27172.result b/storage/spider/mysql-test/spider/bugfix/r/mdev_27172.result
new file mode 100644
index 00000000000..d4c8c7e8ec2
--- /dev/null
+++ b/storage/spider/mysql-test/spider/bugfix/r/mdev_27172.result
@@ -0,0 +1,84 @@
+#
+# MDEV-27172 Prefix indices on Spider tables may lead to wrong query results
+#
+for master_1
+for child2
+child2_1
+child2_2
+child2_3
+for child3
+connection child2_1;
+SET @general_log_backup = @@global.general_log;
+SET @log_output_backup = @@global.log_output;
+SET @@global.general_log = 1;
+SET @@global.log_output = "TABLE";
+CREATE DATABASE auto_test_remote;
+USE auto_test_remote;
+CREATE TABLE tbl_a (
+id int NOT NULL,
+greeting  VARCHAR(255),
+KEY(greeting)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+CREATE TABLE tbl_b (
+id int NOT NULL,
+greeting VARCHAR(255),
+KEY k (greeting(5))
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+CREATE TABLE tbl_c (
+id int NOT NULL,
+greeting TEXT,
+KEY k (greeting(5))
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+TRUNCATE TABLE mysql.general_log;
+connection master_1;
+CREATE DATABASE auto_test_local;
+USE auto_test_local;
+CREATE TABLE tbl_a (
+id int NOT NULL,
+greeting VARCHAR(255),
+KEY k (greeting)
+) ENGINE=Spider DEFAULT CHARSET=utf8 COMMENT='table "tbl_a", srv "s_2_1"';
+INSERT INTO tbl_a VALUES (1, "Hi!"),(2, "Aloha!"),(3, "Aloha!!!");
+SELECT * FROM tbl_a WHERE greeting = "Aloha!"
+  AND CASE greeting WHEN "Aloha!" THEN "one" ELSE 'more' END = "one";
+id	greeting
+2	Aloha!
+CREATE TABLE tbl_b (
+id int NOT NULL,
+greeting VARCHAR(255),
+KEY k (greeting(5))
+) ENGINE=Spider DEFAULT CHARSET=utf8 COMMENT='table "tbl_b", srv "s_2_1"';
+INSERT INTO tbl_b VALUES (1, "Hi!"),(2, "Aloha!"),(3, "Aloha!!!");
+SELECT * FROM tbl_b WHERE greeting = "Aloha!"
+  AND CASE greeting WHEN "Aloha!" THEN "one" ELSE 'more' END = "one";
+id	greeting
+2	Aloha!
+CREATE TABLE tbl_c (
+id int NOT NULL,
+greeting TEXT,
+KEY k (greeting(5))
+) ENGINE=Spider DEFAULT CHARSET=utf8 COMMENT='table "tbl_c", srv "s_2_1"';
+INSERT INTO tbl_c VALUES (1, "Hi!"),(2, "Aloha!"),(3, "Aloha!!!");
+SELECT * FROM tbl_c WHERE greeting = "Aloha!"
+  AND CASE greeting WHEN "Aloha!" THEN "one" ELSE 'more' END = "one";
+id	greeting
+2	Aloha!
+connection child2_1;
+SELECT argument FROM mysql.general_log WHERE argument LIKE 'select %';
+argument
+select `id`,`greeting` from `auto_test_remote`.`tbl_a` where `greeting` = 'Aloha!' and ((`greeting` = 'Aloha!'))
+select `id`,`greeting` from `auto_test_remote`.`tbl_b` where `greeting` like 'Aloha%' and ((`greeting` = 'Aloha!'))
+select `id`,`greeting` from `auto_test_remote`.`tbl_c` where `greeting` like 'Aloha%' and ((`greeting` = 'Aloha!'))
+SELECT argument FROM mysql.general_log WHERE argument LIKE 'select %'
+connection child2_1;
+SET @@global.general_log = @general_log_backup;
+SET @@global.log_output = @log_output_backup;
+DROP DATABASE auto_test_remote;
+connection master_1;
+DROP DATABASE auto_test_local;
+for master_1
+for child2
+child2_1
+child2_2
+child2_3
+for child3
diff --git a/storage/spider/mysql-test/spider/bugfix/t/mdev_27172.cnf b/storage/spider/mysql-test/spider/bugfix/t/mdev_27172.cnf
new file mode 100644
index 00000000000..05dfd8a0bce
--- /dev/null
+++ b/storage/spider/mysql-test/spider/bugfix/t/mdev_27172.cnf
@@ -0,0 +1,3 @@
+!include include/default_mysqld.cnf
+!include ../my_1_1.cnf
+!include ../my_2_1.cnf
diff --git a/storage/spider/mysql-test/spider/bugfix/t/mdev_27172.test b/storage/spider/mysql-test/spider/bugfix/t/mdev_27172.test
new file mode 100644
index 00000000000..d544a0b400e
--- /dev/null
+++ b/storage/spider/mysql-test/spider/bugfix/t/mdev_27172.test
@@ -0,0 +1,92 @@
+--echo #
+--echo # MDEV-27172 Prefix indices on Spider tables may lead to wrong query results
+--echo #
+
+--disable_query_log
+--disable_result_log
+--source ../../t/test_init.inc
+--enable_result_log
+--enable_query_log
+
+--connection child2_1
+SET @general_log_backup = @@global.general_log;
+SET @log_output_backup = @@global.log_output;
+SET @@global.general_log = 1;
+SET @@global.log_output = "TABLE";
+
+CREATE DATABASE auto_test_remote;
+USE auto_test_remote;
+
+eval CREATE TABLE tbl_a (
+  id int NOT NULL,
+  greeting  VARCHAR(255),
+  KEY(greeting)
+) $CHILD2_1_ENGINE $CHILD2_1_CHARSET;
+
+eval CREATE TABLE tbl_b (
+  id int NOT NULL,
+  greeting VARCHAR(255),
+  KEY k (greeting(5))
+) $CHILD2_1_ENGINE $CHILD2_1_CHARSET;
+
+eval CREATE TABLE tbl_c (
+  id int NOT NULL,
+  greeting TEXT,
+  KEY k (greeting(5))
+) $CHILD2_1_ENGINE $CHILD2_1_CHARSET;
+
+TRUNCATE TABLE mysql.general_log;
+
+--connection master_1
+CREATE DATABASE auto_test_local;
+USE auto_test_local;
+
+# = (equality)
+eval CREATE TABLE tbl_a (
+  id int NOT NULL,
+  greeting VARCHAR(255),
+  KEY k (greeting)
+) $MASTER_1_ENGINE $MASTER_1_CHARSET COMMENT='table "tbl_a", srv "s_2_1"';
+
+INSERT INTO tbl_a VALUES (1, "Hi!"),(2, "Aloha!"),(3, "Aloha!!!");
+SELECT * FROM tbl_a WHERE greeting = "Aloha!"
+  AND CASE greeting WHEN "Aloha!" THEN "one" ELSE 'more' END = "one"; # hack to disable GBH
+
+# LIKE
+eval CREATE TABLE tbl_b (
+  id int NOT NULL,
+  greeting VARCHAR(255),
+  KEY k (greeting(5))
+) $MASTER_1_ENGINE $MASTER_1_CHARSET COMMENT='table "tbl_b", srv "s_2_1"';
+
+INSERT INTO tbl_b VALUES (1, "Hi!"),(2, "Aloha!"),(3, "Aloha!!!");
+SELECT * FROM tbl_b WHERE greeting = "Aloha!"
+  AND CASE greeting WHEN "Aloha!" THEN "one" ELSE 'more' END = "one"; # hack to disable GBH
+
+# LIKE
+eval CREATE TABLE tbl_c (
+  id int NOT NULL,
+  greeting TEXT,
+  KEY k (greeting(5))
+) $MASTER_1_ENGINE $MASTER_1_CHARSET COMMENT='table "tbl_c", srv "s_2_1"';
+
+INSERT INTO tbl_c VALUES (1, "Hi!"),(2, "Aloha!"),(3, "Aloha!!!");
+SELECT * FROM tbl_c WHERE greeting = "Aloha!"
+  AND CASE greeting WHEN "Aloha!" THEN "one" ELSE 'more' END = "one"; # hack to disable GBH
+
+--connection child2_1
+SELECT argument FROM mysql.general_log WHERE argument LIKE 'select %';
+
+--connection child2_1
+SET @@global.general_log = @general_log_backup;
+SET @@global.log_output = @log_output_backup;
+DROP DATABASE auto_test_remote;
+
+--connection master_1
+DROP DATABASE auto_test_local;
+
+--disable_query_log
+--disable_result_log
+--source ../../t/test_deinit.inc
+--enable_result_log
+--enable_query_log
diff --git a/storage/spider/spd_db_conn.cc b/storage/spider/spd_db_conn.cc
index 1aafa175a7b..5a8c7492654 100644
--- a/storage/spider/spd_db_conn.cc
+++ b/storage/spider/spd_db_conn.cc
@@ -1824,9 +1824,8 @@ int spider_db_append_key_where_internal(
             DBUG_RETURN(HA_ERR_OUT_OF_MEM);
           dbton_share->append_column_name(str, field->field_index);
           str->q_append(SPIDER_SQL_EQUAL_STR, SPIDER_SQL_EQUAL_LEN);
-          if (spider_dbton[dbton_id].db_util->
-            append_column_value(spider, str, field, ptr,
-              share->access_charset))
+          if (spider_dbton[dbton_id].db_util->append_column_value(
+                  spider, str, field, ptr, FALSE, share->access_charset))
             DBUG_RETURN(HA_ERR_OUT_OF_MEM);
         } else if (sql_kind == SPIDER_SQL_KIND_HANDLER)
         {
@@ -1836,16 +1835,15 @@ int spider_db_append_key_where_internal(
             DBUG_RETURN(HA_ERR_OUT_OF_MEM);
           dbton_share->append_column_name(str_part2, field->field_index);
           str_part2->q_append(SPIDER_SQL_EQUAL_STR, SPIDER_SQL_EQUAL_LEN);
-          if (spider_dbton[dbton_id].db_util->
-            append_column_value(spider, str_part2, field, ptr,
-              share->access_charset))
+          if (spider_dbton[dbton_id].db_util->append_column_value(
+                  spider, str_part2, field, ptr, FALSE, share->access_charset))
             DBUG_RETURN(HA_ERR_OUT_OF_MEM);
 
           if (use_key == start_key)
           {
-            if (spider_dbton[dbton_id].db_util->
-              append_column_value(spider, str_part, field, ptr,
-                share->access_charset))
+            if (spider_dbton[dbton_id].db_util->append_column_value(
+                    spider, str_part, field, ptr, FALSE,
+                    share->access_charset))
               DBUG_RETURN(HA_ERR_OUT_OF_MEM);
           }
         }
@@ -1870,14 +1868,24 @@ int spider_db_append_key_where_internal(
             if (sql_kind == SPIDER_SQL_KIND_SQL)
             {
               if (str->reserve(store_length + key_name_length +
-                /* SPIDER_SQL_NAME_QUOTE_LEN */ 2 +
-                SPIDER_SQL_EQUAL_LEN))
+                               /* SPIDER_SQL_NAME_QUOTE_LEN */ 2))
                 DBUG_RETURN(HA_ERR_OUT_OF_MEM);
+
               dbton_share->append_column_name(str, field->field_index);
-              str->q_append(SPIDER_SQL_EQUAL_STR, SPIDER_SQL_EQUAL_LEN);
-              if (spider_dbton[dbton_id].db_util->
-                append_column_value(spider, str, field, ptr,
-                  share->access_charset))
+
+              bool is_like= MY_TEST(key_part->key_part_flag & HA_PART_KEY_SEG);
+              if (is_like)
+              {
+                if (str->append(SPIDER_SQL_LIKE_STR, SPIDER_SQL_LIKE_LEN))
+                  DBUG_RETURN(HA_ERR_OUT_OF_MEM);
+              }
+              else
+              {
+                if (str->append(SPIDER_SQL_EQUAL_STR, SPIDER_SQL_EQUAL_LEN))
+                  DBUG_RETURN(HA_ERR_OUT_OF_MEM);
+              }
+              if (spider_dbton[dbton_id].db_util->append_column_value(
+                      spider, str, field, ptr, is_like, share->access_charset))
                 DBUG_RETURN(HA_ERR_OUT_OF_MEM);
             } else if (sql_kind == SPIDER_SQL_KIND_HANDLER)
             {
@@ -1887,9 +1895,9 @@ int spider_db_append_key_where_internal(
                 DBUG_RETURN(HA_ERR_OUT_OF_MEM);
               dbton_share->append_column_name(str_part2, field->field_index);
               str_part2->q_append(SPIDER_SQL_EQUAL_STR, SPIDER_SQL_EQUAL_LEN);
-              if (spider_dbton[dbton_id].db_util->
-                append_column_value(spider, str_part2, field, ptr,
-                  share->access_charset))
+              if (spider_dbton[dbton_id].db_util->append_column_value(
+                      spider, str_part2, field, ptr, FALSE,
+                      share->access_charset))
                 DBUG_RETURN(HA_ERR_OUT_OF_MEM);
 
               if (use_key == start_key)
@@ -1900,9 +1908,9 @@ int spider_db_append_key_where_internal(
                     DBUG_RETURN(HA_ERR_OUT_OF_MEM);
                   str->q_append(SPIDER_SQL_EQUAL_STR, SPIDER_SQL_EQUAL_LEN);
                 }
-                if (spider_dbton[dbton_id].db_util->
-                  append_column_value(spider, str_part, field, ptr,
-                    share->access_charset))
+                if (spider_dbton[dbton_id].db_util->append_column_value(
+                        spider, str_part, field, ptr, FALSE,
+                        share->access_charset))
                   DBUG_RETURN(HA_ERR_OUT_OF_MEM);
               }
             }
@@ -1935,9 +1943,8 @@ int spider_db_append_key_where_internal(
                 DBUG_RETURN(HA_ERR_OUT_OF_MEM);
               dbton_share->append_column_name(str, field->field_index);
               str->q_append(op_str, op_len);
-              if (spider_dbton[dbton_id].db_util->
-                append_column_value(spider, str, field, ptr,
-                  share->access_charset))
+              if (spider_dbton[dbton_id].db_util->append_column_value(
+                      spider, str, field, ptr, FALSE, share->access_charset))
                 DBUG_RETURN(HA_ERR_OUT_OF_MEM);
               if (use_both)
                 start_key_part_map = 0;
@@ -1954,9 +1961,9 @@ int spider_db_append_key_where_internal(
                 DBUG_RETURN(HA_ERR_OUT_OF_MEM);
               dbton_share->append_column_name(str_part2, field->field_index);
               str_part2->q_append(SPIDER_SQL_GT_STR, SPIDER_SQL_GT_LEN);
-              if (spider_dbton[dbton_id].db_util->
-                append_column_value(spider, str_part2, field, ptr,
-                  share->access_charset))
+              if (spider_dbton[dbton_id].db_util->append_column_value(
+                      spider, str_part2, field, ptr, FALSE,
+                      share->access_charset))
                 DBUG_RETURN(HA_ERR_OUT_OF_MEM);
 
               if (use_key == start_key)
@@ -1967,9 +1974,9 @@ int spider_db_append_key_where_internal(
                     DBUG_RETURN(HA_ERR_OUT_OF_MEM);
                   str->q_append(SPIDER_SQL_GT_STR, SPIDER_SQL_GT_LEN);
                 }
-                if (spider_dbton[dbton_id].db_util->
-                  append_column_value(spider, str_part, field, ptr,
-                    share->access_charset))
+                if (spider_dbton[dbton_id].db_util->append_column_value(
+                        spider, str_part, field, ptr, FALSE,
+                        share->access_charset))
                   DBUG_RETURN(HA_ERR_OUT_OF_MEM);
               }
             }
@@ -2003,9 +2010,8 @@ int spider_db_append_key_where_internal(
                 DBUG_RETURN(HA_ERR_OUT_OF_MEM);
               dbton_share->append_column_name(str, field->field_index);
               str->q_append(op_str, op_len);
-              if (spider_dbton[dbton_id].db_util->
-                append_column_value(spider, str, field, ptr,
-                  share->access_charset))
+              if (spider_dbton[dbton_id].db_util->append_column_value(
+                      spider, str, field, ptr, FALSE, share->access_charset))
                 DBUG_RETURN(HA_ERR_OUT_OF_MEM);
               if (use_both)
                 start_key_part_map = 0;
@@ -2022,9 +2028,9 @@ int spider_db_append_key_where_internal(
                 DBUG_RETURN(HA_ERR_OUT_OF_MEM);
               dbton_share->append_column_name(str_part2, field->field_index);
               str_part2->q_append(SPIDER_SQL_LT_STR, SPIDER_SQL_LT_LEN);
-              if (spider_dbton[dbton_id].db_util->
-                append_column_value(spider, str_part2, field, ptr,
-                  share->access_charset))
+              if (spider_dbton[dbton_id].db_util->append_column_value(
+                      spider, str_part2, field, ptr, FALSE,
+                      share->access_charset))
                 DBUG_RETURN(HA_ERR_OUT_OF_MEM);
 
               if (use_key == start_key)
@@ -2035,9 +2041,9 @@ int spider_db_append_key_where_internal(
                     DBUG_RETURN(HA_ERR_OUT_OF_MEM);
                   str->q_append(SPIDER_SQL_LT_STR, SPIDER_SQL_LT_LEN);
                 }
-                if (spider_dbton[dbton_id].db_util->
-                  append_column_value(spider, str_part, field, ptr,
-                    share->access_charset))
+                if (spider_dbton[dbton_id].db_util->append_column_value(
+                        spider, str_part, field, ptr, FALSE,
+                        share->access_charset))
                   DBUG_RETURN(HA_ERR_OUT_OF_MEM);
               }
             }
@@ -2070,9 +2076,8 @@ int spider_db_append_key_where_internal(
                 DBUG_RETURN(HA_ERR_OUT_OF_MEM);
               dbton_share->append_column_name(str, field->field_index);
               str->q_append(SPIDER_SQL_LTEQUAL_STR, SPIDER_SQL_LTEQUAL_LEN);
-              if (spider_dbton[dbton_id].db_util->
-                append_column_value(spider, str, field, ptr,
-                  share->access_charset))
+              if (spider_dbton[dbton_id].db_util->append_column_value(
+                      spider, str, field, ptr, FALSE, share->access_charset))
                 DBUG_RETURN(HA_ERR_OUT_OF_MEM);
               if (!set_order)
               {
@@ -2088,9 +2093,9 @@ int spider_db_append_key_where_internal(
               dbton_share->append_column_name(str_part2, field->field_index);
               str_part2->q_append(SPIDER_SQL_LTEQUAL_STR,
                 SPIDER_SQL_LTEQUAL_LEN);
-              if (spider_dbton[dbton_id].db_util->
-                append_column_value(spider, str_part2, field, ptr,
-                  share->access_charset))
+              if (spider_dbton[dbton_id].db_util->append_column_value(
+                      spider, str_part2, field, ptr, false,
+                      share->access_charset))
                 DBUG_RETURN(HA_ERR_OUT_OF_MEM);
 
               if (use_key == start_key)
@@ -2102,9 +2107,9 @@ int spider_db_append_key_where_internal(
                   str->q_append(SPIDER_SQL_LTEQUAL_STR,
                     SPIDER_SQL_LTEQUAL_LEN);
                 }
-                if (spider_dbton[dbton_id].db_util->
-                  append_column_value(spider, str_part, field, ptr,
-                    share->access_charset))
+                if (spider_dbton[dbton_id].db_util->append_column_value(
+                        spider, str_part, field, ptr, FALSE,
+                        share->access_charset))
                   DBUG_RETURN(HA_ERR_OUT_OF_MEM);
               }
             }
@@ -2126,13 +2131,11 @@ int spider_db_append_key_where_internal(
               DBUG_RETURN(HA_ERR_OUT_OF_MEM);
             str->q_append(SPIDER_SQL_MBR_CONTAIN_STR,
               SPIDER_SQL_MBR_CONTAIN_LEN);
-            if (
-              spider_dbton[dbton_id].db_util->
-                append_column_value(spider, str, field, ptr,
-                  share->access_charset) ||
-              str->reserve(SPIDER_SQL_COMMA_LEN + key_name_length +
-                /* SPIDER_SQL_NAME_QUOTE_LEN */ 2 + SPIDER_SQL_CLOSE_PAREN_LEN)
-            )
+            if (spider_dbton[dbton_id].db_util->append_column_value(
+                    spider, str, field, ptr, FALSE, share->access_charset) ||
+                str->reserve(SPIDER_SQL_COMMA_LEN + key_name_length +
+                             /* SPIDER_SQL_NAME_QUOTE_LEN */ 2 +
+                             SPIDER_SQL_CLOSE_PAREN_LEN))
               DBUG_RETURN(HA_ERR_OUT_OF_MEM);
             str->q_append(SPIDER_SQL_COMMA_STR, SPIDER_SQL_COMMA_LEN);
             dbton_share->append_column_name(str, field->field_index);
@@ -2144,13 +2147,11 @@ int spider_db_append_key_where_internal(
               DBUG_RETURN(HA_ERR_OUT_OF_MEM);
             str->q_append(SPIDER_SQL_MBR_INTERSECT_STR,
               SPIDER_SQL_MBR_INTERSECT_LEN);
-            if (
-              spider_dbton[dbton_id].db_util->
-                append_column_value(spider, str, field, ptr,
-                  share->access_charset) ||
-              str->reserve(SPIDER_SQL_COMMA_LEN + key_name_length +
-                /* SPIDER_SQL_NAME_QUOTE_LEN */ 2 + SPIDER_SQL_CLOSE_PAREN_LEN)
-            )
+            if (spider_dbton[dbton_id].db_util->append_column_value(
+                    spider, str, field, ptr, FALSE, share->access_charset) ||
+                str->reserve(SPIDER_SQL_COMMA_LEN + key_name_length +
+                             /* SPIDER_SQL_NAME_QUOTE_LEN */ 2 +
+                             SPIDER_SQL_CLOSE_PAREN_LEN))
               DBUG_RETURN(HA_ERR_OUT_OF_MEM);
             str->q_append(SPIDER_SQL_COMMA_STR, SPIDER_SQL_COMMA_LEN);
             dbton_share->append_column_name(str, field->field_index);
@@ -2162,13 +2163,11 @@ int spider_db_append_key_where_internal(
               DBUG_RETURN(HA_ERR_OUT_OF_MEM);
             str->q_append(SPIDER_SQL_MBR_WITHIN_STR,
               SPIDER_SQL_MBR_WITHIN_LEN);
-            if (
-              spider_dbton[dbton_id].db_util->
-                append_column_value(spider, str, field, ptr,
-                  share->access_charset) ||
-              str->reserve(SPIDER_SQL_COMMA_LEN + key_name_length +
-                /* SPIDER_SQL_NAME_QUOTE_LEN */ 2 + SPIDER_SQL_CLOSE_PAREN_LEN)
-            )
+            if (spider_dbton[dbton_id].db_util->append_column_value(
+                    spider, str, field, ptr, FALSE, share->access_charset) ||
+                str->reserve(SPIDER_SQL_COMMA_LEN + key_name_length +
+                             /* SPIDER_SQL_NAME_QUOTE_LEN */ 2 +
+                             SPIDER_SQL_CLOSE_PAREN_LEN))
               DBUG_RETURN(HA_ERR_OUT_OF_MEM);
             str->q_append(SPIDER_SQL_COMMA_STR, SPIDER_SQL_COMMA_LEN);
             dbton_share->append_column_name(str, field->field_index);
@@ -2180,13 +2179,11 @@ int spider_db_append_key_where_internal(
               DBUG_RETURN(HA_ERR_OUT_OF_MEM);
             str->q_append(SPIDER_SQL_MBR_DISJOINT_STR,
               SPIDER_SQL_MBR_DISJOINT_LEN);
-            if (
-              spider_dbton[dbton_id].db_util->
-                append_column_value(spider, str, field, ptr,
-                  share->access_charset) ||
-              str->reserve(SPIDER_SQL_COMMA_LEN + key_name_length +
-                /* SPIDER_SQL_NAME_QUOTE_LEN */ 2 + SPIDER_SQL_CLOSE_PAREN_LEN)
-            )
+            if (spider_dbton[dbton_id].db_util->append_column_value(
+                    spider, str, field, ptr, FALSE, share->access_charset) ||
+                str->reserve(SPIDER_SQL_COMMA_LEN + key_name_length +
+                             /* SPIDER_SQL_NAME_QUOTE_LEN */ 2 +
+                             SPIDER_SQL_CLOSE_PAREN_LEN))
               DBUG_RETURN(HA_ERR_OUT_OF_MEM);
             str->q_append(SPIDER_SQL_COMMA_STR, SPIDER_SQL_COMMA_LEN);
             dbton_share->append_column_name(str, field->field_index);
@@ -2197,13 +2194,11 @@ int spider_db_append_key_where_internal(
             if (str->reserve(SPIDER_SQL_MBR_EQUAL_LEN))
               DBUG_RETURN(HA_ERR_OUT_OF_MEM);
             str->q_append(SPIDER_SQL_MBR_EQUAL_STR, SPIDER_SQL_MBR_EQUAL_LEN);
-            if (
-              spider_dbton[dbton_id].db_util->
-                append_column_value(spider, str, field, ptr,
-                  share->access_charset) ||
-              str->reserve(SPIDER_SQL_COMMA_LEN + key_name_length +
-                /* SPIDER_SQL_NAME_QUOTE_LEN */ 2 + SPIDER_SQL_CLOSE_PAREN_LEN)
-            )
+            if (spider_dbton[dbton_id].db_util->append_column_value(
+                    spider, str, field, ptr, FALSE, share->access_charset) ||
+                str->reserve(SPIDER_SQL_COMMA_LEN + key_name_length +
+                             /* SPIDER_SQL_NAME_QUOTE_LEN */ 2 +
+                             SPIDER_SQL_CLOSE_PAREN_LEN))
               DBUG_RETURN(HA_ERR_OUT_OF_MEM);
             str->q_append(SPIDER_SQL_COMMA_STR, SPIDER_SQL_COMMA_LEN);
             dbton_share->append_column_name(str, field->field_index);
@@ -2219,9 +2214,8 @@ int spider_db_append_key_where_internal(
                 DBUG_RETURN(HA_ERR_OUT_OF_MEM);
               dbton_share->append_column_name(str, field->field_index);
               str->q_append(SPIDER_SQL_GTEQUAL_STR, SPIDER_SQL_GTEQUAL_LEN);
-              if (spider_dbton[dbton_id].db_util->
-                append_column_value(spider, str, field, ptr,
-                  share->access_charset))
+              if (spider_dbton[dbton_id].db_util->append_column_value(
+                      spider, str, field, ptr, FALSE, share->access_charset))
                 DBUG_RETURN(HA_ERR_OUT_OF_MEM);
               if (!set_order)
               {
@@ -2237,9 +2231,9 @@ int spider_db_append_key_where_internal(
               dbton_share->append_column_name(str_part2, field->field_index);
               str_part2->q_append(SPIDER_SQL_GTEQUAL_STR,
                 SPIDER_SQL_GTEQUAL_LEN);
-              if (spider_dbton[dbton_id].db_util->
-                append_column_value(spider, str_part2, field, ptr,
-                  share->access_charset))
+              if (spider_dbton[dbton_id].db_util->append_column_value(
+                      spider, str_part2, field, ptr, false,
+                      share->access_charset))
                 DBUG_RETURN(HA_ERR_OUT_OF_MEM);
 
               if (use_key == start_key)
@@ -2251,9 +2245,9 @@ int spider_db_append_key_where_internal(
                   str->q_append(SPIDER_SQL_GTEQUAL_STR,
                     SPIDER_SQL_GTEQUAL_LEN);
                 }
-                if (spider_dbton[dbton_id].db_util->
-                  append_column_value(spider, str_part, field, ptr,
-                    share->access_charset))
+                if (spider_dbton[dbton_id].db_util->append_column_value(
+                        spider, str_part, field, ptr, FALSE,
+                        share->access_charset))
                   DBUG_RETURN(HA_ERR_OUT_OF_MEM);
               }
             }
@@ -2328,9 +2322,8 @@ int spider_db_append_key_where_internal(
               DBUG_RETURN(HA_ERR_OUT_OF_MEM);
             dbton_share->append_column_name(str, field->field_index);
             str->q_append(SPIDER_SQL_EQUAL_STR, SPIDER_SQL_EQUAL_LEN);
-            if (spider_dbton[dbton_id].db_util->
-              append_column_value(spider, str, field, ptr,
-                share->access_charset))
+            if (spider_dbton[dbton_id].db_util->append_column_value(
+                    spider, str, field, ptr, FALSE, share->access_charset))
               DBUG_RETURN(HA_ERR_OUT_OF_MEM);
           } else {
             if (str_part2->reserve(store_length + key_name_length +
@@ -2339,9 +2332,9 @@ int spider_db_append_key_where_internal(
               DBUG_RETURN(HA_ERR_OUT_OF_MEM);
             dbton_share->append_column_name(str_part2, field->field_index);
             str_part2->q_append(SPIDER_SQL_EQUAL_STR, SPIDER_SQL_EQUAL_LEN);
-            if (spider_dbton[dbton_id].db_util->
-              append_column_value(spider, str_part2, field, ptr,
-                share->access_charset))
+            if (spider_dbton[dbton_id].db_util->append_column_value(
+                    spider, str_part2, field, ptr, false,
+                    share->access_charset))
               DBUG_RETURN(HA_ERR_OUT_OF_MEM);
 
             if (use_key == end_key)
@@ -2354,10 +2347,9 @@ int spider_db_append_key_where_internal(
                 str->q_append(SPIDER_SQL_EQUAL_STR, SPIDER_SQL_EQUAL_LEN);
               }
 */
-              if (spider_dbton[dbton_id].db_util->
-                append_column_value(spider, str_part, field, ptr,
-                  share->access_charset))
-                DBUG_RETURN(HA_ERR_OUT_OF_MEM);
+            if (spider_dbton[dbton_id].db_util->append_column_value(
+                    spider, str_part, field, ptr, FALSE, share->access_charset))
+              DBUG_RETURN(HA_ERR_OUT_OF_MEM);
             }
           }
         } else {
@@ -2381,9 +2373,8 @@ int spider_db_append_key_where_internal(
                   DBUG_RETURN(HA_ERR_OUT_OF_MEM);
                 dbton_share->append_column_name(str, field->field_index);
                 str->q_append(op_str, op_len);
-                if (spider_dbton[dbton_id].db_util->
-                  append_column_value(spider, str, field, ptr,
-                    share->access_charset))
+                if (spider_dbton[dbton_id].db_util->append_column_value(
+                        spider, str, field, ptr, FALSE, share->access_charset))
                   DBUG_RETURN(HA_ERR_OUT_OF_MEM);
                 if (use_both)
                   end_key_part_map = 0;
@@ -2399,9 +2390,9 @@ int spider_db_append_key_where_internal(
                   DBUG_RETURN(HA_ERR_OUT_OF_MEM);
                 dbton_share->append_column_name(str_part2, field->field_index);
                 str_part2->q_append(SPIDER_SQL_LT_STR, SPIDER_SQL_LT_LEN);
-                if (spider_dbton[dbton_id].db_util->
-                  append_column_value(spider, str_part2, field, ptr,
-                    share->access_charset))
+                if (spider_dbton[dbton_id].db_util->append_column_value(
+                        spider, str_part2, field, ptr, false,
+                        share->access_charset))
                   DBUG_RETURN(HA_ERR_OUT_OF_MEM);
 
                 if (use_key == end_key)
@@ -2412,9 +2403,9 @@ int spider_db_append_key_where_internal(
                       DBUG_RETURN(HA_ERR_OUT_OF_MEM);
                     str->q_append(SPIDER_SQL_LT_STR, SPIDER_SQL_LT_LEN);
                   }
-                  if (spider_dbton[dbton_id].db_util->
-                    append_column_value(spider, str_part, field, ptr,
-                      share->access_charset))
+                  if (spider_dbton[dbton_id].db_util->append_column_value(
+                          spider, str_part, field, ptr, FALSE,
+                          share->access_charset))
                     DBUG_RETURN(HA_ERR_OUT_OF_MEM);
                 }
               }
@@ -2428,9 +2419,8 @@ int spider_db_append_key_where_internal(
                   DBUG_RETURN(HA_ERR_OUT_OF_MEM);
                 dbton_share->append_column_name(str, field->field_index);
                 str->q_append(SPIDER_SQL_LTEQUAL_STR, SPIDER_SQL_LTEQUAL_LEN);
-                if (spider_dbton[dbton_id].db_util->
-                  append_column_value(spider, str, field, ptr,
-                    share->access_charset))
+                if (spider_dbton[dbton_id].db_util->append_column_value(
+                        spider, str, field, ptr, FALSE, share->access_charset))
                   DBUG_RETURN(HA_ERR_OUT_OF_MEM);
                 if (!set_order)
                 {
@@ -2445,9 +2435,9 @@ int spider_db_append_key_where_internal(
                 dbton_share->append_column_name(str_part2, field->field_index);
                 str_part2->q_append(SPIDER_SQL_LTEQUAL_STR,
                   SPIDER_SQL_LTEQUAL_LEN);
-                if (spider_dbton[dbton_id].db_util->
-                  append_column_value(spider, str_part2, field, ptr,
-                    share->access_charset))
+                if (spider_dbton[dbton_id].db_util->append_column_value(
+                        spider, str_part2, field, ptr, false,
+                        share->access_charset))
                   DBUG_RETURN(HA_ERR_OUT_OF_MEM);
 
                 if (use_key == end_key)
@@ -2459,9 +2449,9 @@ int spider_db_append_key_where_internal(
                     str->q_append(SPIDER_SQL_LTEQUAL_STR,
                       SPIDER_SQL_LTEQUAL_LEN);
                   }
-                  if (spider_dbton[dbton_id].db_util->
-                    append_column_value(spider, str_part, field, ptr,
-                      share->access_charset))
+                  if (spider_dbton[dbton_id].db_util->append_column_value(
+                          spider, str_part, field, ptr, FALSE,
+                          share->access_charset))
                     DBUG_RETURN(HA_ERR_OUT_OF_MEM);
                 }
               }
diff --git a/storage/spider/spd_db_include.h b/storage/spider/spd_db_include.h
index d51770c1a77..823f0a9c9fc 100644
--- a/storage/spider/spd_db_include.h
+++ b/storage/spider/spd_db_include.h
@@ -94,6 +94,8 @@ typedef st_spider_result SPIDER_RESULT;
 
 #define SPIDER_SQL_DOT_STR "."
 #define SPIDER_SQL_DOT_LEN (sizeof(SPIDER_SQL_DOT_STR) - 1)
+#define SPIDER_SQL_PERCENT_STR "%"
+#define SPIDER_SQL_PERCENT_LEN (sizeof(SPIDER_SQL_PERCENT_STR) - 1)
 
 #define SPIDER_SQL_EQUAL_STR " = "
 #define SPIDER_SQL_EQUAL_LEN (sizeof(SPIDER_SQL_EQUAL_STR) - 1)
@@ -161,6 +163,8 @@ typedef st_spider_result SPIDER_RESULT;
 #define SPIDER_SQL_IN_LEN (sizeof(SPIDER_SQL_IN_STR) - 1)
 #define SPIDER_SQL_NOT_IN_STR "not in("
 #define SPIDER_SQL_NOT_IN_LEN (sizeof(SPIDER_SQL_NOT_IN_STR) - 1)
+#define SPIDER_SQL_LIKE_STR " like "
+#define SPIDER_SQL_LIKE_LEN (sizeof(SPIDER_SQL_LIKE_STR) - 1)
 #define SPIDER_SQL_NOT_LIKE_STR "not like"
 #define SPIDER_SQL_NOT_LIKE_LEN (sizeof(SPIDER_SQL_NOT_LIKE_STR) - 1)
 #define SPIDER_SQL_AS_CHAR_STR " as char"
@@ -818,13 +822,10 @@ public:
   virtual int append_escaped_name_quote(
     spider_string *str
   ) = 0;
-  virtual int append_column_value(
-    ha_spider *spider,
-    spider_string *str,
-    Field *field,
-    const uchar *new_ptr,
-    CHARSET_INFO *access_charset
-  ) = 0;
+  virtual int append_column_value(ha_spider *spider, spider_string *str,
+                                  Field *field, const uchar *new_ptr,
+                                  bool is_like,
+                                  CHARSET_INFO *access_charset)= 0;
   virtual int append_trx_isolation(
     spider_string *str,
     int trx_isolation
diff --git a/storage/spider/spd_db_mysql.cc b/storage/spider/spd_db_mysql.cc
index 4a210a3c67d..5f6107e66a0 100644
--- a/storage/spider/spd_db_mysql.cc
+++ b/storage/spider/spd_db_mysql.cc
@@ -3680,13 +3680,12 @@ int spider_db_mbase_util::append_escaped_name_quote(
   DBUG_RETURN(0);
 }
 
-int spider_db_mbase_util::append_column_value(
-  ha_spider *spider,
-  spider_string *str,
-  Field *field,
-  const uchar *new_ptr,
-  CHARSET_INFO *access_charset
-) {
+int spider_db_mbase_util::append_column_value(ha_spider *spider,
+                                              spider_string *str, Field *field,
+                                              const uchar *new_ptr,
+                                              bool is_like,
+                                              CHARSET_INFO *access_charset)
+{
   char buf[MAX_FIELD_WIDTH];
   spider_string tmp_str(buf, MAX_FIELD_WIDTH, &my_charset_bin);
   String *ptr;
@@ -3710,70 +3709,15 @@ int spider_db_mbase_util::append_column_value(
       ptr = tmp_str.get_str();
     } else if (field->type() == MYSQL_TYPE_GEOMETRY)
     {
-/*
-      uint mlength = SIZEOF_STORED_DOUBLE, lcnt;
-      uchar *dest = (uchar *) buf;
-      const uchar *source;
-      for (lcnt = 0; lcnt < 4; lcnt++)
-      {
-        mlength = SIZEOF_STORED_DOUBLE;
-        source = new_ptr + mlength + SIZEOF_STORED_DOUBLE * lcnt;
-        while (mlength--)
-          *dest++ = *--source;
-      }
-      tmp_str.length(SIZEOF_STORED_DOUBLE * lcnt);
-*/
 #ifndef DBUG_OFF
       double xmin, xmax, ymin, ymax;
-/*
-      float8store(buf,xmin);
-      float8store(buf+8,xmax);
-      float8store(buf+16,ymin);
-      float8store(buf+24,ymax);
-      memcpy(&xmin,new_ptr,sizeof(xmin));
-      memcpy(&xmax,new_ptr + 8,sizeof(xmax));
-      memcpy(&ymin,new_ptr + 16,sizeof(ymin));
-      memcpy(&ymax,new_ptr + 24,sizeof(ymax));
-      float8get(xmin, buf);
-      float8get(xmax, buf + 8);
-      float8get(ymin, buf + 16);
-      float8get(ymax, buf + 24);
-      DBUG_PRINT("info", ("spider geo is %f %f %f %f",
-        xmin, xmax, ymin, ymax));
-      DBUG_PRINT("info", ("spider geo is %.14g %.14g %.14g %.14g",
-        xmin, xmax, ymin, ymax));
-*/
       float8get(xmin, new_ptr);
       float8get(xmax, new_ptr + 8);
       float8get(ymin, new_ptr + 16);
       float8get(ymax, new_ptr + 24);
       DBUG_PRINT("info", ("spider geo is %f %f %f %f",
         xmin, xmax, ymin, ymax));
-/*
-      float8get(xmin, new_ptr + SIZEOF_STORED_DOUBLE * 4);
-      float8get(xmax, new_ptr + SIZEOF_STORED_DOUBLE * 5);
-      float8get(ymin, new_ptr + SIZEOF_STORED_DOUBLE * 6);
-      float8get(ymax, new_ptr + SIZEOF_STORED_DOUBLE * 7);
-      DBUG_PRINT("info", ("spider geo is %f %f %f %f",
-        xmin, xmax, ymin, ymax));
-      float8get(xmin, new_ptr + SIZEOF_STORED_DOUBLE * 8);
-      float8get(xmax, new_ptr + SIZEOF_STORED_DOUBLE * 9);
-      float8get(ymin, new_ptr + SIZEOF_STORED_DOUBLE * 10);
-      float8get(ymax, new_ptr + SIZEOF_STORED_DOUBLE * 11);
-      DBUG_PRINT("info", ("spider geo is %f %f %f %f",
-        xmin, xmax, ymin, ymax));
-      float8get(xmin, new_ptr + SIZEOF_STORED_DOUBLE * 12);
-      float8get(xmax, new_ptr + SIZEOF_STORED_DOUBLE * 13);
-      float8get(ymin, new_ptr + SIZEOF_STORED_DOUBLE * 14);
-      float8get(ymax, new_ptr + SIZEOF_STORED_DOUBLE * 15);
-      DBUG_PRINT("info", ("spider geo is %f %f %f %f",
-        xmin, xmax, ymin, ymax));
-*/
 #endif
-/*
-      tmp_str.set_quick((char *) new_ptr, SIZEOF_STORED_DOUBLE * 4,
-        &my_charset_bin);
-*/
       tmp_str.length(0);
       tmp_str.q_append((char *) SPIDER_SQL_LINESTRING_HEAD_STR,
         SPIDER_SQL_LINESTRING_HEAD_LEN);
@@ -3798,27 +3742,7 @@ int spider_db_mbase_util::append_column_value(
 
   DBUG_PRINT("info", ("spider field->type() is %d", field->type()));
   DBUG_PRINT("info", ("spider ptr->length() is %d", ptr->length()));
-/*
-  if (
-    field->type() == MYSQL_TYPE_BIT ||
-    (field->type() >= MYSQL_TYPE_TINY_BLOB &&
-      field->type() <= MYSQL_TYPE_BLOB)
-  ) {
-    uchar *hex_ptr = (uchar *) ptr->ptr(), *end_ptr;
-    char *str_ptr;
-    DBUG_PRINT("info", ("spider HEX"));
-    if (str->reserve(SPIDER_SQL_HEX_LEN + ptr->length() * 2))
-      DBUG_RETURN(HA_ERR_OUT_OF_MEM);
-    str->q_append(SPIDER_SQL_HEX_STR, SPIDER_SQL_HEX_LEN);
-    str_ptr = (char *) str->ptr() + str->length();
-    for (end_ptr = hex_ptr + ptr->length(); hex_ptr < end_ptr; hex_ptr++)
-    {
-      *str_ptr++ = spider_dig_upper[(*hex_ptr) >> 4];
-      *str_ptr++ = spider_dig_upper[(*hex_ptr) & 0x0F];
-    }
-    str->length(str->length() + ptr->length() * 2);
-  } else 
-*/
+
   if (field->result_type() == STRING_RESULT)
   {
     DBUG_PRINT("info", ("spider STRING_RESULT"));
@@ -3841,6 +3765,10 @@ int spider_db_mbase_util::append_column_value(
         append_escaped_util(str, tmp_str2.get_str())
       )
         DBUG_RETURN(HA_ERR_OUT_OF_MEM);
+
+      if (is_like &&
+          str->append(SPIDER_SQL_PERCENT_STR, SPIDER_SQL_PERCENT_LEN))
+        DBUG_RETURN(HA_ERR_OUT_OF_MEM);
     } else if (str->append(*ptr))
       DBUG_RETURN(HA_ERR_OUT_OF_MEM);
     if (str->reserve(SPIDER_SQL_VALUE_QUOTE_LEN))
@@ -3855,6 +3783,7 @@ int spider_db_mbase_util::append_column_value(
     str->q_append(SPIDER_SQL_VALUE_QUOTE_STR, SPIDER_SQL_VALUE_QUOTE_LEN);
   } else if (str->append(*ptr))
     DBUG_RETURN(HA_ERR_OUT_OF_MEM);
+
   DBUG_RETURN(0);
 }
 
@@ -7881,12 +7810,10 @@ int spider_mbase_handler::append_insert_for_recovery(
         DBUG_RETURN(HA_ERR_OUT_OF_MEM);
       insert_sql->q_append(SPIDER_SQL_NULL_STR, SPIDER_SQL_NULL_LEN);
     } else {
-      if (
-        spider_db_mbase_utility->
-          append_column_value(spider, insert_sql, *field, NULL,
-            share->access_charset) ||
-        insert_sql->reserve(SPIDER_SQL_COMMA_LEN)
-      )
+      if (spider_db_mysql_utility.append_column_value(spider, insert_sql,
+                                                      *field, NULL, false,
+                                                      share->access_charset) ||
+          insert_sql->reserve(SPIDER_SQL_COMMA_LEN))
         DBUG_RETURN(HA_ERR_OUT_OF_MEM);
     }
     insert_sql->q_append(SPIDER_SQL_COMMA_STR, SPIDER_SQL_COMMA_LEN);
@@ -8275,12 +8202,10 @@ int spider_mbase_handler::append_update_set(
 #ifndef DBUG_OFF
         MY_BITMAP *tmp_map = dbug_tmp_use_all_columns(table, &table->read_set);
 #endif
-        if (
-          spider_db_mbase_utility->
-            append_column_value(spider, str, *fields, NULL,
-              share->access_charset) ||
-          str->reserve(SPIDER_SQL_COMMA_LEN)
-        ) {
+        if (spider_db_mysql_utility.append_column_value(
+                spider, str, *fields, NULL, FALSE, share->access_charset) ||
+            str->reserve(SPIDER_SQL_COMMA_LEN))
+        {
 #ifndef DBUG_OFF
           dbug_tmp_restore_column_map(&table->read_set, tmp_map);
 #endif
@@ -9079,8 +9004,8 @@ int spider_mbase_handler::append_key_column_values(
       if (error_num > 0)
         DBUG_RETURN(error_num);
     } else {
-      if (spider_db_mbase_utility->append_column_value(spider, str, field, ptr,
-        share->access_charset))
+      if (spider_db_mysql_utility.append_column_value(
+              spider, str, field, ptr, FALSE, share->access_charset))
         DBUG_RETURN(HA_ERR_OUT_OF_MEM);
     }
 
@@ -9160,8 +9085,8 @@ int spider_mbase_handler::append_key_column_values_with_name(
       if (error_num > 0)
         DBUG_RETURN(error_num);
     } else {
-      if (spider_db_mbase_utility->append_column_value(spider, str, field, ptr,
-        share->access_charset))
+      if (spider_db_mysql_utility.append_column_value(
+              spider, str, field, ptr, FALSE, share->access_charset))
         DBUG_RETURN(HA_ERR_OUT_OF_MEM);
     }
 
@@ -9533,12 +9458,9 @@ int spider_mbase_handler::append_update_where(
           mysql_share->append_column_name(str, (*field)->field_index);
           str->q_append(SPIDER_SQL_EQUAL_STR, SPIDER_SQL_EQUAL_LEN);
           (*field)->move_field_offset(ptr_diff);
-          if (
-            spider_db_mbase_utility->
-              append_column_value(spider, str, *field, NULL,
-                share->access_charset) ||
-            str->reserve(SPIDER_SQL_AND_LEN)
-          )
+          if (spider_db_mbase_utility->append_column_value(
+                  spider, str, *field, NULL, FALSE, share->access_charset) ||
+              str->reserve(SPIDER_SQL_AND_LEN))
             DBUG_RETURN(HA_ERR_OUT_OF_MEM);
           (*field)->move_field_offset(-ptr_diff);
         }
@@ -9573,12 +9495,9 @@ int spider_mbase_handler::append_update_where(
         mysql_share->append_column_name(str, (*field)->field_index);
         str->q_append(SPIDER_SQL_EQUAL_STR, SPIDER_SQL_EQUAL_LEN);
         (*field)->move_field_offset(ptr_diff);
-        if (
-          spider_db_mbase_utility->
-            append_column_value(spider, str, *field, NULL,
-              share->access_charset) ||
-          str->reserve(SPIDER_SQL_AND_LEN)
-        )
+        if (spider_db_mysql_utility.append_column_value(
+                spider, str, *field, NULL, FALSE, share->access_charset) ||
+            str->reserve(SPIDER_SQL_AND_LEN))
           DBUG_RETURN(HA_ERR_OUT_OF_MEM);
         (*field)->move_field_offset(-ptr_diff);
       }
@@ -11009,12 +10928,10 @@ int spider_mbase_handler::append_insert_values(
         }
         str->q_append(SPIDER_SQL_NULL_STR, SPIDER_SQL_NULL_LEN);
       } else {
-        if (
-          spider_db_mbase_utility->
-            append_column_value(spider, str, *field, NULL,
-              share->access_charset) ||
-          str->reserve(SPIDER_SQL_COMMA_LEN)
-        ) {
+        if (spider_db_mysql_utility.append_column_value(
+                spider, str, *field, NULL, FALSE, share->access_charset) ||
+            str->reserve(SPIDER_SQL_COMMA_LEN))
+        {
 #ifndef DBUG_OFF
           dbug_tmp_restore_column_map(&table->read_set, tmp_map);
 #endif
diff --git a/storage/spider/spd_db_mysql.h b/storage/spider/spd_db_mysql.h
index d50bb0d1f9d..4d5327b7533 100644
--- a/storage/spider/spd_db_mysql.h
+++ b/storage/spider/spd_db_mysql.h
@@ -35,13 +35,9 @@ public:
   int append_escaped_name_quote(
     spider_string *str
   );
-  int append_column_value(
-    ha_spider *spider,
-    spider_string *str,
-    Field *field,
-    const uchar *new_ptr,
-    CHARSET_INFO *access_charset
-  );
+  int append_column_value(ha_spider *spider, spider_string *str, Field *field,
+                          const uchar *new_ptr, bool is_like,
+                          CHARSET_INFO *access_charset);
   int append_from_with_alias(
     spider_string *str,
     const char **table_names,