Skip to content

Commit b7e4dc1

Browse files
MDEV-27240 fixup: remove dead code
1 parent 64f844b commit b7e4dc1

File tree

3 files changed

+3
-25
lines changed

3 files changed

+3
-25
lines changed

storage/spider/ha_spider.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ int ha_spider::open(
335335
SPIDER_WIDE_SHARE *wide_share;
336336
#ifdef WITH_PARTITION_STORAGE_ENGINE
337337
uint part_num;
338-
bool pt_handler_share_alloc = FALSE;
338+
bool partition_handler_alloc = FALSE;
339339
ha_spider **wide_handler_handlers = NULL;
340340
ha_partition *clone_source;
341341
#endif
@@ -456,7 +456,7 @@ int ha_spider::open(
456456
spider->partition_handler = partition_handler;
457457
owner->partition_handler = partition_handler;
458458
partition_handler->handlers = wide_handler_handlers;
459-
pt_handler_share_alloc = TRUE;
459+
partition_handler_alloc = TRUE;
460460
} else {
461461
wide_handler = spider->wide_handler;
462462
partition_handler = wide_handler->partition_handler;
@@ -588,7 +588,7 @@ int ha_spider::open(
588588
error_init_blob_buff:
589589
error_init_result_list:
590590
#ifdef WITH_PARTITION_STORAGE_ENGINE
591-
if (pt_handler_share_alloc)
591+
if (partition_handler_alloc)
592592
{
593593
wide_share = share->wide_share;
594594
spider->partition_handler = NULL;

storage/spider/spd_table.cc

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,6 @@ PSI_mutex_key spd_key_mutex_share_auto_increment;
184184
#ifdef WITH_PARTITION_STORAGE_ENGINE
185185
PSI_mutex_key spd_key_mutex_wide_share_sts;
186186
PSI_mutex_key spd_key_mutex_wide_share_crd;
187-
PSI_mutex_key spd_key_mutex_pt_handler;
188187
#endif
189188
PSI_mutex_key spd_key_mutex_udf_table;
190189
PSI_mutex_key spd_key_mutex_mem_calc;
@@ -244,7 +243,6 @@ static PSI_mutex_info all_spider_mutexes[]=
244243
#ifdef WITH_PARTITION_STORAGE_ENGINE
245244
{ &spd_key_mutex_wide_share_sts, "wide_share_sts", 0},
246245
{ &spd_key_mutex_wide_share_crd, "wide_share_crd", 0},
247-
{ &spd_key_mutex_pt_handler, "pt_handler", 0},
248246
#endif
249247
{ &spd_key_mutex_udf_table, "udf_table", 0},
250248
{ &spd_key_mutex_conn_loop_check, "conn_loop_check", 0},
@@ -430,18 +428,6 @@ uchar *spider_wide_share_get_key(
430428
DBUG_RETURN((uchar*) share->table_name);
431429
}
432430

433-
#ifdef WITH_PARTITION_STORAGE_ENGINE
434-
uchar *spider_pt_handler_share_get_key(
435-
SPIDER_PARTITION_HANDLER *share,
436-
size_t *length,
437-
my_bool not_used __attribute__ ((unused))
438-
) {
439-
DBUG_ENTER("spider_pt_handler_share_get_key");
440-
*length = sizeof(ha_spider *);
441-
DBUG_RETURN((uchar*) share->owner);
442-
}
443-
#endif
444-
445431
uchar *spider_lgtm_tblhnd_share_hash_get_key(
446432
SPIDER_LGTM_TBLHND_SHARE *share,
447433
size_t *length,

storage/spider/spd_table.h

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -319,14 +319,6 @@ uchar *spider_wide_share_get_key(
319319
my_bool not_used __attribute__ ((unused))
320320
);
321321

322-
#ifdef WITH_PARTITION_STORAGE_ENGINE
323-
uchar *spider_pt_handler_share_get_key(
324-
SPIDER_PARTITION_HANDLER *share,
325-
size_t *length,
326-
my_bool not_used __attribute__ ((unused))
327-
);
328-
#endif
329-
330322
uchar *spider_link_get_key(
331323
SPIDER_LINK_FOR_HASH *link_for_hash,
332324
size_t *length,

0 commit comments

Comments
 (0)