summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNayuta Yanagisawa <nayuta.yanagisawa@hey.com>2022-01-15 21:24:25 +0900
committerNayuta Yanagisawa <nayuta.yanagisawa@hey.com>2022-01-15 21:24:25 +0900
commitb7e4dc121a99e7d38ce2d50ad8f9f948152d7e17 (patch)
tree7f99063fe525f86fd4724c12794de34c6347cca7
parent64f844b611d38f05303a88e4ab0aaa37062233b8 (diff)
downloadmariadb-git-bb-10.5-MDEV-27240.tar.gz
MDEV-27240 fixup: remove dead codebb-10.5-MDEV-27240
-rw-r--r--storage/spider/ha_spider.cc6
-rw-r--r--storage/spider/spd_table.cc14
-rw-r--r--storage/spider/spd_table.h8
3 files changed, 3 insertions, 25 deletions
diff --git a/storage/spider/ha_spider.cc b/storage/spider/ha_spider.cc
index 1de57156dcf..d139b2ecea0 100644
--- a/storage/spider/ha_spider.cc
+++ b/storage/spider/ha_spider.cc
@@ -335,7 +335,7 @@ int ha_spider::open(
SPIDER_WIDE_SHARE *wide_share;
#ifdef WITH_PARTITION_STORAGE_ENGINE
uint part_num;
- bool pt_handler_share_alloc = FALSE;
+ bool partition_handler_alloc = FALSE;
ha_spider **wide_handler_handlers = NULL;
ha_partition *clone_source;
#endif
@@ -456,7 +456,7 @@ int ha_spider::open(
spider->partition_handler = partition_handler;
owner->partition_handler = partition_handler;
partition_handler->handlers = wide_handler_handlers;
- pt_handler_share_alloc = TRUE;
+ partition_handler_alloc = TRUE;
} else {
wide_handler = spider->wide_handler;
partition_handler = wide_handler->partition_handler;
@@ -588,7 +588,7 @@ error_reset:
error_init_blob_buff:
error_init_result_list:
#ifdef WITH_PARTITION_STORAGE_ENGINE
- if (pt_handler_share_alloc)
+ if (partition_handler_alloc)
{
wide_share = share->wide_share;
spider->partition_handler = NULL;
diff --git a/storage/spider/spd_table.cc b/storage/spider/spd_table.cc
index 792a8a4ac12..608e0ca811e 100644
--- a/storage/spider/spd_table.cc
+++ b/storage/spider/spd_table.cc
@@ -184,7 +184,6 @@ PSI_mutex_key spd_key_mutex_share_auto_increment;
#ifdef WITH_PARTITION_STORAGE_ENGINE
PSI_mutex_key spd_key_mutex_wide_share_sts;
PSI_mutex_key spd_key_mutex_wide_share_crd;
-PSI_mutex_key spd_key_mutex_pt_handler;
#endif
PSI_mutex_key spd_key_mutex_udf_table;
PSI_mutex_key spd_key_mutex_mem_calc;
@@ -244,7 +243,6 @@ static PSI_mutex_info all_spider_mutexes[]=
#ifdef WITH_PARTITION_STORAGE_ENGINE
{ &spd_key_mutex_wide_share_sts, "wide_share_sts", 0},
{ &spd_key_mutex_wide_share_crd, "wide_share_crd", 0},
- { &spd_key_mutex_pt_handler, "pt_handler", 0},
#endif
{ &spd_key_mutex_udf_table, "udf_table", 0},
{ &spd_key_mutex_conn_loop_check, "conn_loop_check", 0},
@@ -430,18 +428,6 @@ uchar *spider_wide_share_get_key(
DBUG_RETURN((uchar*) share->table_name);
}
-#ifdef WITH_PARTITION_STORAGE_ENGINE
-uchar *spider_pt_handler_share_get_key(
- SPIDER_PARTITION_HANDLER *share,
- size_t *length,
- my_bool not_used __attribute__ ((unused))
-) {
- DBUG_ENTER("spider_pt_handler_share_get_key");
- *length = sizeof(ha_spider *);
- DBUG_RETURN((uchar*) share->owner);
-}
-#endif
-
uchar *spider_lgtm_tblhnd_share_hash_get_key(
SPIDER_LGTM_TBLHND_SHARE *share,
size_t *length,
diff --git a/storage/spider/spd_table.h b/storage/spider/spd_table.h
index 61f9f04d543..dc351e73c61 100644
--- a/storage/spider/spd_table.h
+++ b/storage/spider/spd_table.h
@@ -319,14 +319,6 @@ uchar *spider_wide_share_get_key(
my_bool not_used __attribute__ ((unused))
);
-#ifdef WITH_PARTITION_STORAGE_ENGINE
-uchar *spider_pt_handler_share_get_key(
- SPIDER_PARTITION_HANDLER *share,
- size_t *length,
- my_bool not_used __attribute__ ((unused))
-);
-#endif
-
uchar *spider_link_get_key(
SPIDER_LINK_FOR_HASH *link_for_hash,
size_t *length,