Commit e1fc2f4d authored by Kentoku SHIBA's avatar Kentoku SHIBA

Fix valgrind warnings.

parent 04471ba7
...@@ -67,6 +67,7 @@ ha_spider::ha_spider( ...@@ -67,6 +67,7 @@ ha_spider::ha_spider(
conns = NULL; conns = NULL;
need_mons = NULL; need_mons = NULL;
condition = NULL; condition = NULL;
cond_check = FALSE;
blob_buff = NULL; blob_buff = NULL;
conn_keys = NULL; conn_keys = NULL;
spider_thread_id = 0; spider_thread_id = 0;
...@@ -159,6 +160,7 @@ ha_spider::ha_spider( ...@@ -159,6 +160,7 @@ ha_spider::ha_spider(
conns = NULL; conns = NULL;
need_mons = NULL; need_mons = NULL;
condition = NULL; condition = NULL;
cond_check = FALSE;
blob_buff = NULL; blob_buff = NULL;
conn_keys = NULL; conn_keys = NULL;
spider_thread_id = 0; spider_thread_id = 0;
...@@ -1676,6 +1678,7 @@ int ha_spider::reset() ...@@ -1676,6 +1678,7 @@ int ha_spider::reset()
spider_free(spider_current_trx, condition, MYF(0)); spider_free(spider_current_trx, condition, MYF(0));
condition = tmp_cond; condition = tmp_cond;
} }
cond_check = FALSE;
#ifdef HA_MRR_USE_DEFAULT_IMPL #ifdef HA_MRR_USE_DEFAULT_IMPL
if (multi_range_keys) if (multi_range_keys)
{ {
......
...@@ -371,15 +371,29 @@ int spider_get_sys_table_by_idx( ...@@ -371,15 +371,29 @@ int spider_get_sys_table_by_idx(
const int col_count const int col_count
) { ) {
int error_num; int error_num;
uint key_length;
KEY *key_info = table->key_info;
DBUG_ENTER("spider_get_sys_table_by_idx"); DBUG_ENTER("spider_get_sys_table_by_idx");
if ((error_num = spider_sys_index_init(table, idx, FALSE))) if ((error_num = spider_sys_index_init(table, idx, FALSE)))
DBUG_RETURN(error_num); DBUG_RETURN(error_num);
if ((int) key_info->key_parts == col_count)
{
key_length = key_info->key_length;
} else {
int roop_count;
key_length = 0;
for (roop_count = 0; roop_count < col_count; ++roop_count)
{
key_length += key_info->key_part[roop_count].store_length;
}
}
key_copy( key_copy(
(uchar *) table_key, (uchar *) table_key,
table->record[0], table->record[0],
table->key_info, key_info,
table->key_info->key_length); key_length);
if ( if (
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment