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
4e7ffc83
Commit
4e7ffc83
authored
Oct 18, 2018
by
Marko Mäkelä
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove unused code and clarify comments
parent
fa21647a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
16 deletions
+3
-16
storage/innobase/include/dict0mem.h
storage/innobase/include/dict0mem.h
+0
-15
storage/innobase/row/row0log.cc
storage/innobase/row/row0log.cc
+3
-1
No files found.
storage/innobase/include/dict0mem.h
View file @
4e7ffc83
...
@@ -1603,21 +1603,6 @@ struct dict_table_t {
...
@@ -1603,21 +1603,6 @@ struct dict_table_t {
return
NULL
;
return
NULL
;
}
}
/** Get the n-drop columns till the given n_cols.
@param[in] n_cols number of old columns
@return number of drop columns */
static
unsigned
get_n_drop_cols
(
const
ulint
*
col_map
,
unsigned
n_cols
)
{
unsigned
n_drop_cols
=
0
;
for
(
ulint
i
=
0
;
i
<
n_cols
;
i
++
)
{
if
(
col_map
[
i
]
==
ULINT_UNDEFINED
)
{
n_drop_cols
++
;
}
}
return
n_drop_cols
;
}
/** Serialise metadata of dropped or reordered columns.
/** Serialise metadata of dropped or reordered columns.
@param[in,out] heap memory heap for allocation
@param[in,out] heap memory heap for allocation
@param[out] field data field with the metadata */
@param[out] field data field with the metadata */
...
...
storage/innobase/row/row0log.cc
View file @
4e7ffc83
...
@@ -1560,7 +1560,8 @@ row_log_table_apply_convert_mrec(
...
@@ -1560,7 +1560,8 @@ row_log_table_apply_convert_mrec(
=
dict_field_get_col
(
ind_field
);
=
dict_field_get_col
(
ind_field
);
if
(
col
->
is_dropped
())
{
if
(
col
->
is_dropped
())
{
ut_ad
(
index
->
is_instant
());
/* the column was instantly dropped earlier */
ut_ad
(
index
->
table
->
instant
);
continue
;
continue
;
}
}
...
@@ -1568,6 +1569,7 @@ row_log_table_apply_convert_mrec(
...
@@ -1568,6 +1569,7 @@ row_log_table_apply_convert_mrec(
=
log
->
col_map
[
dict_col_get_no
(
col
)];
=
log
->
col_map
[
dict_col_get_no
(
col
)];
if
(
col_no
==
ULINT_UNDEFINED
)
{
if
(
col_no
==
ULINT_UNDEFINED
)
{
/* the column is being dropped now */
continue
;
continue
;
}
}
...
...
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