database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-12 20:49:12 +03:00
Code Activity

fix compiler warnings

Browse Source
This commit is contained in:
Kentoku SHIBA
2013-05-28 11:25:02 +09:00
parent cf4afa6059
commit 1059b55276
6 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
storage/spider/ha_spider.cc
View File

@@ -10494,6 +10494,8 @@ int ha_spider::info_push(
bulk_access_started = FALSE; bulk_access_started = FALSE;
break; break;
#endif #endif
default:
break;
} }
DBUG_RETURN(error_num); DBUG_RETURN(error_num);
} }

8
storage/spider/spd_conn.cc
View File

@@ -2714,7 +2714,7 @@ void *spider_bg_sts_action(
if (roop_count == SPIDER_DBTON_SIZE) if (roop_count == SPIDER_DBTON_SIZE)
{ {
DBUG_PRINT("info",("spider handler init error")); 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 ( if (
spider_bit_is_set(share->dbton_bitmap, roop_count) && spider_bit_is_set(share->dbton_bitmap, roop_count) &&
@@ -2750,7 +2750,7 @@ void *spider_bg_sts_action(
if (share->bg_sts_kill) if (share->bg_sts_kill)
{ {
DBUG_PRINT("info",("spider bg sts kill start")); 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 ( if (
spider_bit_is_set(share->dbton_bitmap, roop_count) && spider_bit_is_set(share->dbton_bitmap, roop_count) &&
@@ -3096,7 +3096,7 @@ void *spider_bg_crd_action(
if (roop_count == SPIDER_DBTON_SIZE) if (roop_count == SPIDER_DBTON_SIZE)
{ {
DBUG_PRINT("info",("spider handler init error")); 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 ( if (
spider_bit_is_set(share->dbton_bitmap, roop_count) && spider_bit_is_set(share->dbton_bitmap, roop_count) &&
@@ -3132,7 +3132,7 @@ void *spider_bg_crd_action(
if (share->bg_crd_kill) if (share->bg_crd_kill)
{ {
DBUG_PRINT("info",("spider bg crd kill start")); 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 ( if (
spider_bit_is_set(share->dbton_bitmap, roop_count) && spider_bit_is_set(share->dbton_bitmap, roop_count) &&

4
storage/spider/spd_db_conn.cc
View File

@@ -8163,9 +8163,9 @@ int spider_db_udf_direct_sql(
set_off = table->s->fields; set_off = table->s->fields;
} }
for (roop_count2 = 0; roop_count2 < set_on; roop_count2++) 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++) 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 MYSQL_VERSION_ID < 50500
if (table->file->has_transactions()) if (table->file->has_transactions())

2
storage/spider/spd_db_mysql.cc
View File

@@ -2474,6 +2474,7 @@ int spider_db_mysql_util::append_column_value(
} }
tmp_str.length(SIZEOF_STORED_DOUBLE * lcnt); tmp_str.length(SIZEOF_STORED_DOUBLE * lcnt);
*/ */
#ifndef DBUG_OFF
double xmin, xmax, ymin, ymax; double xmin, xmax, ymin, ymax;
/* /*
float8store(buf,xmin); 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", DBUG_PRINT("info", ("spider geo is %f %f %f %f",
xmin, xmax, ymin, ymax)); xmin, xmax, ymin, ymax));
*/ */
#endif
/* /*
tmp_str.set_quick((char *) new_ptr, SIZEOF_STORED_DOUBLE * 4, tmp_str.set_quick((char *) new_ptr, SIZEOF_STORED_DOUBLE * 4,
&my_charset_bin); &my_charset_bin);

5
storage/spider/spd_i_s.cc
View File

@@ -141,5 +141,8 @@ struct st_mysql_plugin spider_i_s_alloc_mem =
0x0001, 0x0001,
NULL, NULL,
NULL, NULL,
NULL NULL,
#if MYSQL_VERSION_ID >= 50600
0,
#endif
}; };

5
storage/spider/spd_param.cc
View File

@@ -2908,7 +2908,10 @@ mysql_declare_plugin(spider)
0x0300, 0x0300,
spider_status_variables, spider_status_variables,
spider_system_variables, spider_system_variables,
NULL NULL,
#if MYSQL_VERSION_ID >= 50600
0,
#endif
}, },
spider_i_s_alloc_mem spider_i_s_alloc_mem
mysql_declare_plugin_end; mysql_declare_plugin_end;