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
a3d2d2c4
Commit
a3d2d2c4
authored
Mar 03, 2020
by
Aleksey Midenkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-21747 needless alter_ctx arg in prep_alter_part_table()
parent
193725b8
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
6 deletions
+3
-6
sql/sql_partition.cc
sql/sql_partition.cc
+2
-3
sql/sql_partition.h
sql/sql_partition.h
+0
-1
sql/sql_table.cc
sql/sql_table.cc
+1
-2
No files found.
sql/sql_partition.cc
View file @
a3d2d2c4
...
...
@@ -4805,7 +4805,6 @@ static void check_datadir_altered_for_innodb(THD *thd,
uint
prep_alter_part_table
(
THD
*
thd
,
TABLE
*
table
,
Alter_info
*
alter_info
,
HA_CREATE_INFO
*
create_info
,
Alter_table_ctx
*
alter_ctx
,
bool
*
partition_changed
,
bool
*
fast_alter_table
)
{
...
...
@@ -4900,8 +4899,8 @@ uint prep_alter_part_table(THD *thd, TABLE *table, Alter_info *alter_info,
object to allow fast_alter_partition_table to perform the changes.
*/
DBUG_ASSERT
(
thd
->
mdl_context
.
is_lock_owner
(
MDL_key
::
TABLE
,
alter_ctx
->
db
.
str
,
alter_ctx
->
table_name
.
str
,
table
->
s
->
db
.
str
,
table
->
s
->
table_name
.
str
,
MDL_INTENTION_EXCLUSIVE
));
tab_part_info
=
table
->
part_info
;
...
...
sql/sql_partition.h
View file @
a3d2d2c4
...
...
@@ -262,7 +262,6 @@ bool set_part_state(Alter_info *alter_info, partition_info *tab_part_info,
enum
partition_state
part_state
);
uint
prep_alter_part_table
(
THD
*
thd
,
TABLE
*
table
,
Alter_info
*
alter_info
,
HA_CREATE_INFO
*
create_info
,
Alter_table_ctx
*
alter_ctx
,
bool
*
partition_changed
,
bool
*
fast_alter_table
);
char
*
generate_partition_syntax
(
THD
*
thd
,
partition_info
*
part_info
,
...
...
sql/sql_table.cc
View file @
a3d2d2c4
...
...
@@ -9892,8 +9892,7 @@ do_continue:;
bool
fast_alter_partition
=
false
;
{
if
(
prep_alter_part_table
(
thd
,
table
,
alter_info
,
create_info
,
&
alter_ctx
,
&
partition_changed
,
&
fast_alter_partition
))
&
partition_changed
,
&
fast_alter_partition
))
{
DBUG_RETURN
(
true
);
}
...
...
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