Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
b7e4dc12
Commit
b7e4dc12
authored
Jan 15, 2022
by
Nayuta Yanagisawa
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-27240 fixup: remove dead code
parent
64f844b6
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
25 deletions
+3
-25
storage/spider/ha_spider.cc
storage/spider/ha_spider.cc
+3
-3
storage/spider/spd_table.cc
storage/spider/spd_table.cc
+0
-14
storage/spider/spd_table.h
storage/spider/spd_table.h
+0
-8
No files found.
storage/spider/ha_spider.cc
View file @
b7e4dc12
...
@@ -335,7 +335,7 @@ int ha_spider::open(
...
@@ -335,7 +335,7 @@ int ha_spider::open(
SPIDER_WIDE_SHARE
*
wide_share
;
SPIDER_WIDE_SHARE
*
wide_share
;
#ifdef WITH_PARTITION_STORAGE_ENGINE
#ifdef WITH_PARTITION_STORAGE_ENGINE
uint
part_num
;
uint
part_num
;
bool
p
t_handler_share
_alloc
=
FALSE
;
bool
p
artition_handler
_alloc
=
FALSE
;
ha_spider
**
wide_handler_handlers
=
NULL
;
ha_spider
**
wide_handler_handlers
=
NULL
;
ha_partition
*
clone_source
;
ha_partition
*
clone_source
;
#endif
#endif
...
@@ -456,7 +456,7 @@ int ha_spider::open(
...
@@ -456,7 +456,7 @@ int ha_spider::open(
spider
->
partition_handler
=
partition_handler
;
spider
->
partition_handler
=
partition_handler
;
owner
->
partition_handler
=
partition_handler
;
owner
->
partition_handler
=
partition_handler
;
partition_handler
->
handlers
=
wide_handler_handlers
;
partition_handler
->
handlers
=
wide_handler_handlers
;
p
t_handler_share
_alloc
=
TRUE
;
p
artition_handler
_alloc
=
TRUE
;
}
else
{
}
else
{
wide_handler
=
spider
->
wide_handler
;
wide_handler
=
spider
->
wide_handler
;
partition_handler
=
wide_handler
->
partition_handler
;
partition_handler
=
wide_handler
->
partition_handler
;
...
@@ -588,7 +588,7 @@ int ha_spider::open(
...
@@ -588,7 +588,7 @@ int ha_spider::open(
error_init_blob_buff:
error_init_blob_buff:
error_init_result_list:
error_init_result_list:
#ifdef WITH_PARTITION_STORAGE_ENGINE
#ifdef WITH_PARTITION_STORAGE_ENGINE
if
(
p
t_handler_share
_alloc
)
if
(
p
artition_handler
_alloc
)
{
{
wide_share
=
share
->
wide_share
;
wide_share
=
share
->
wide_share
;
spider
->
partition_handler
=
NULL
;
spider
->
partition_handler
=
NULL
;
...
...
storage/spider/spd_table.cc
View file @
b7e4dc12
...
@@ -184,7 +184,6 @@ PSI_mutex_key spd_key_mutex_share_auto_increment;
...
@@ -184,7 +184,6 @@ PSI_mutex_key spd_key_mutex_share_auto_increment;
#ifdef WITH_PARTITION_STORAGE_ENGINE
#ifdef WITH_PARTITION_STORAGE_ENGINE
PSI_mutex_key
spd_key_mutex_wide_share_sts
;
PSI_mutex_key
spd_key_mutex_wide_share_sts
;
PSI_mutex_key
spd_key_mutex_wide_share_crd
;
PSI_mutex_key
spd_key_mutex_wide_share_crd
;
PSI_mutex_key
spd_key_mutex_pt_handler
;
#endif
#endif
PSI_mutex_key
spd_key_mutex_udf_table
;
PSI_mutex_key
spd_key_mutex_udf_table
;
PSI_mutex_key
spd_key_mutex_mem_calc
;
PSI_mutex_key
spd_key_mutex_mem_calc
;
...
@@ -244,7 +243,6 @@ static PSI_mutex_info all_spider_mutexes[]=
...
@@ -244,7 +243,6 @@ static PSI_mutex_info all_spider_mutexes[]=
#ifdef WITH_PARTITION_STORAGE_ENGINE
#ifdef WITH_PARTITION_STORAGE_ENGINE
{
&
spd_key_mutex_wide_share_sts
,
"wide_share_sts"
,
0
},
{
&
spd_key_mutex_wide_share_sts
,
"wide_share_sts"
,
0
},
{
&
spd_key_mutex_wide_share_crd
,
"wide_share_crd"
,
0
},
{
&
spd_key_mutex_wide_share_crd
,
"wide_share_crd"
,
0
},
{
&
spd_key_mutex_pt_handler
,
"pt_handler"
,
0
},
#endif
#endif
{
&
spd_key_mutex_udf_table
,
"udf_table"
,
0
},
{
&
spd_key_mutex_udf_table
,
"udf_table"
,
0
},
{
&
spd_key_mutex_conn_loop_check
,
"conn_loop_check"
,
0
},
{
&
spd_key_mutex_conn_loop_check
,
"conn_loop_check"
,
0
},
...
@@ -430,18 +428,6 @@ uchar *spider_wide_share_get_key(
...
@@ -430,18 +428,6 @@ uchar *spider_wide_share_get_key(
DBUG_RETURN
((
uchar
*
)
share
->
table_name
);
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
(
uchar
*
spider_lgtm_tblhnd_share_hash_get_key
(
SPIDER_LGTM_TBLHND_SHARE
*
share
,
SPIDER_LGTM_TBLHND_SHARE
*
share
,
size_t
*
length
,
size_t
*
length
,
...
...
storage/spider/spd_table.h
View file @
b7e4dc12
...
@@ -319,14 +319,6 @@ uchar *spider_wide_share_get_key(
...
@@ -319,14 +319,6 @@ uchar *spider_wide_share_get_key(
my_bool
not_used
__attribute__
((
unused
))
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
(
uchar
*
spider_link_get_key
(
SPIDER_LINK_FOR_HASH
*
link_for_hash
,
SPIDER_LINK_FOR_HASH
*
link_for_hash
,
size_t
*
length
,
size_t
*
length
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment