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
7ad742b2
Commit
7ad742b2
authored
Dec 21, 2018
by
Sergey Vojtovich
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Simplified code, no functional changes
parent
4007eaba
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
41 deletions
+11
-41
sql/sql_table.cc
sql/sql_table.cc
+11
-41
No files found.
sql/sql_table.cc
View file @
7ad742b2
...
...
@@ -9586,7 +9586,7 @@ bool mysql_alter_table(THD *thd, const LEX_CSTRING *new_db,
key_info
,
key_count
,
IF_PARTITIONING
(
thd
->
work_part_info
,
NULL
),
ignore
);
TABLE
*
altered_table
=
NULL
;
TABLE
*
altered_table
;
bool
use_inplace
=
true
;
/* Fill the Alter_inplace_info structure. */
...
...
@@ -9754,52 +9754,22 @@ bool mysql_alter_table(THD *thd, const LEX_CSTRING *new_db,
/* Mark that we have created table in storage engine. */
no_ha_table
=
false
;
if
(
create_info
->
tmp_table
())
{
TABLE
*
tmp_table
=
thd
->
create_and_open_tmp_table
(
new_db_type
,
&
frm
,
/* Open the table since we need to copy the data. */
new_table
=
thd
->
create_and_open_tmp_table
(
new_db_type
,
&
frm
,
alter_ctx
.
get_tmp_path
(),
alter_ctx
.
new_db
.
str
,
alter_ctx
.
tmp_name
.
str
,
true
,
true
);
if
(
!
tmp_table
)
{
if
(
!
new_table
)
goto
err_new_table_cleanup
;
}
/* in case of alter temp table send the tracker in OK packet */
SESSION_TRACKER_CHANGED
(
thd
,
SESSION_STATE_CHANGE_TRACKER
,
NULL
);
}
/* Open the table since we need to copy the data. */
if
(
table
->
s
->
tmp_table
!=
NO_TMP_TABLE
)
{
TABLE_LIST
tbl
;
tbl
.
init_one_table
(
&
alter_ctx
.
new_db
,
&
alter_ctx
.
tmp_name
,
0
,
TL_READ_NO_INSERT
);
/*
Table can be found in the list of open tables in THD::all_temp_tables
list.
*/
if
((
tbl
.
table
=
thd
->
find_temporary_table
(
&
tbl
))
==
NULL
)
goto
err_new_table_cleanup
;
new_table
=
tbl
.
table
;
DBUG_ASSERT
(
new_table
);
/* in case of alter temp table send the tracker in OK packet */
SESSION_TRACKER_CHANGED
(
thd
,
SESSION_STATE_CHANGE_TRACKER
,
NULL
);
}
else
{
/*
table is a normal table: Create temporary table in same directory.
Open our intermediate table.
*/
new_table
=
thd
->
create_and_open_tmp_table
(
new_db_type
,
&
frm
,
alter_ctx
.
get_tmp_path
(),
alter_ctx
.
new_db
.
str
,
alter_ctx
.
tmp_name
.
str
,
true
,
true
);
if
(
!
new_table
)
goto
err_new_table_cleanup
;
/*
Normally, an attempt to modify an FK parent table will cause
FK children to be prelocked, so the table-being-altered cannot
...
...
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