From 1059b55276f60c4475f39e6f7574e3b2f77dcd3c Mon Sep 17 00:00:00 2001
From: Kentoku SHIBA <kentokushiba@gmail.com>
Date: Tue, 28 May 2013 11:25:02 +0900
Subject: [PATCH] fix compiler warnings

---
 storage/spider/ha_spider.cc    | 2 ++
 storage/spider/spd_conn.cc     | 8 ++++----
 storage/spider/spd_db_conn.cc  | 4 ++--
 storage/spider/spd_db_mysql.cc | 2 ++
 storage/spider/spd_i_s.cc      | 5 ++++-
 storage/spider/spd_param.cc    | 5 ++++-
 6 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/storage/spider/ha_spider.cc b/storage/spider/ha_spider.cc
index c9797730e95..b23cab86afc 100644
--- a/storage/spider/ha_spider.cc
+++ b/storage/spider/ha_spider.cc
@@ -10494,6 +10494,8 @@ int ha_spider::info_push(
       bulk_access_started = FALSE;
       break;
 #endif
+    default:
+      break;
   }
   DBUG_RETURN(error_num);
 }
diff --git a/storage/spider/spd_conn.cc b/storage/spider/spd_conn.cc
index 0c03a59334a..b297b099d8c 100644
--- a/storage/spider/spd_conn.cc
+++ b/storage/spider/spd_conn.cc
@@ -2714,7 +2714,7 @@ void *spider_bg_sts_action(
   if (roop_count == SPIDER_DBTON_SIZE)
   {
     DBUG_PRINT("info",("spider handler init error"));
-    for (; roop_count >= 0; roop_count--)
+    for (roop_count = SPIDER_DBTON_SIZE - 1; roop_count >= 0; --roop_count)
     {
       if (
         spider_bit_is_set(share->dbton_bitmap, roop_count) &&
@@ -2750,7 +2750,7 @@ void *spider_bg_sts_action(
     if (share->bg_sts_kill)
     {
       DBUG_PRINT("info",("spider bg sts kill start"));
-      for (roop_count = SPIDER_DBTON_SIZE; roop_count >= 0; roop_count--)
+      for (roop_count = SPIDER_DBTON_SIZE - 1; roop_count >= 0; --roop_count)
       {
         if (
           spider_bit_is_set(share->dbton_bitmap, roop_count) &&
@@ -3096,7 +3096,7 @@ void *spider_bg_crd_action(
   if (roop_count == SPIDER_DBTON_SIZE)
   {
     DBUG_PRINT("info",("spider handler init error"));
-    for (; roop_count >= 0; roop_count--)
+    for (roop_count = SPIDER_DBTON_SIZE - 1; roop_count >= 0; --roop_count)
     {
       if (
         spider_bit_is_set(share->dbton_bitmap, roop_count) &&
@@ -3132,7 +3132,7 @@ void *spider_bg_crd_action(
     if (share->bg_crd_kill)
     {
       DBUG_PRINT("info",("spider bg crd kill start"));
-      for (roop_count = SPIDER_DBTON_SIZE; roop_count >= 0; roop_count--)
+      for (roop_count = SPIDER_DBTON_SIZE - 1; roop_count >= 0; --roop_count)
       {
         if (
           spider_bit_is_set(share->dbton_bitmap, roop_count) &&
diff --git a/storage/spider/spd_db_conn.cc b/storage/spider/spd_db_conn.cc
index 849e532a782..adf40c3ff94 100644
--- a/storage/spider/spd_db_conn.cc
+++ b/storage/spider/spd_db_conn.cc
@@ -8163,9 +8163,9 @@ int spider_db_udf_direct_sql(
                 set_off = table->s->fields;
               }
               for (roop_count2 = 0; roop_count2 < set_on; roop_count2++)
-                bitmap_set_bit(table->write_set, roop_count2);
+                bitmap_set_bit(table->write_set, (uint) roop_count2);
               for (; roop_count2 < set_off; roop_count2++)
-                bitmap_clear_bit(table->write_set, roop_count2);
+                bitmap_clear_bit(table->write_set, (uint) roop_count2);
 
 #if MYSQL_VERSION_ID < 50500
               if (table->file->has_transactions())
diff --git a/storage/spider/spd_db_mysql.cc b/storage/spider/spd_db_mysql.cc
index 64cee70978e..3907ddf4f14 100644
--- a/storage/spider/spd_db_mysql.cc
+++ b/storage/spider/spd_db_mysql.cc
@@ -2474,6 +2474,7 @@ int spider_db_mysql_util::append_column_value(
       }
       tmp_str.length(SIZEOF_STORED_DOUBLE * lcnt);
 */
+#ifndef DBUG_OFF
       double xmin, xmax, ymin, ymax;
 /*
       float8store(buf,xmin);
@@ -2519,6 +2520,7 @@ int spider_db_mysql_util::append_column_value(
       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);
diff --git a/storage/spider/spd_i_s.cc b/storage/spider/spd_i_s.cc
index fd9d1f2a316..c32745dae98 100644
--- a/storage/spider/spd_i_s.cc
+++ b/storage/spider/spd_i_s.cc
@@ -141,5 +141,8 @@ struct st_mysql_plugin spider_i_s_alloc_mem =
   0x0001,
   NULL,
   NULL,
-  NULL
+  NULL,
+#if MYSQL_VERSION_ID >= 50600
+  0,
+#endif
 };
diff --git a/storage/spider/spd_param.cc b/storage/spider/spd_param.cc
index 9c603341f4c..a8cd1bf9878 100644
--- a/storage/spider/spd_param.cc
+++ b/storage/spider/spd_param.cc
@@ -2908,7 +2908,10 @@ mysql_declare_plugin(spider)
   0x0300,
   spider_status_variables,
   spider_system_variables,
-  NULL
+  NULL,
+#if MYSQL_VERSION_ID >= 50600
+  0,
+#endif
 },
 spider_i_s_alloc_mem
 mysql_declare_plugin_end;