Skip to content

Commit 2bca412

Browse files
committed
Remove MLOG_COMP_REC_SEC_DELETE_MARK.
The InnoDB redo log record type MLOG_COMP_REC_SEC_DELETE_MARK has been unused for a long time, and it has never been written after WL#8845 introduced the redo log format identifier in MySQL 5.7.9 or MariaDB Server 10.2.2. Thus, removing the record type does not constitute any functional change.
1 parent 89d80c1 commit 2bca412

File tree

2 files changed

+2
-21
lines changed

2 files changed

+2
-21
lines changed

storage/innobase/include/mtr0types.h

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*****************************************************************************
22
33
Copyright (c) 1995, 2015, Oracle and/or its affiliates. All Rights Reserved.
4-
Copyright (c) 2017, MariaDB Corporation
4+
Copyright (c) 2017, MariaDB Corporation.
55
66
This program is free software; you can redistribute it and/or modify it under
77
the terms of the GNU General Public License as published by the Free Software
@@ -168,11 +168,6 @@ enum mlog_id_t {
168168
/** mark compact clustered index record deleted */
169169
MLOG_COMP_REC_CLUST_DELETE_MARK = 39,
170170

171-
/** mark compact secondary index record deleted; this log
172-
record type is redundant, as MLOG_REC_SEC_DELETE_MARK is
173-
independent of the record format. */
174-
MLOG_COMP_REC_SEC_DELETE_MARK = 40,
175-
176171
/** update of a compact record, preserves record field sizes */
177172
MLOG_COMP_REC_UPDATE_IN_PLACE = 41,
178173

storage/innobase/log/log0recv.cc

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
33
Copyright (c) 1997, 2016, Oracle and/or its affiliates. All Rights Reserved.
44
Copyright (c) 2012, Facebook Inc.
5-
Copyright (c) 2013, 2017, MariaDB Corporation. All Rights Reserved.
5+
Copyright (c) 2013, 2017, MariaDB Corporation.
66
77
This program is free software; you can redistribute it and/or modify it under
88
the terms of the GNU General Public License as published by the Free Software
@@ -1331,17 +1331,6 @@ recv_parse_or_apply_log_rec_body(
13311331
ptr, end_ptr, page, page_zip, index);
13321332
}
13331333
break;
1334-
case MLOG_COMP_REC_SEC_DELETE_MARK:
1335-
ut_ad(!page || fil_page_type_is_index(page_type));
1336-
/* This log record type is obsolete, but we process it for
1337-
backward compatibility with MySQL 5.0.3 and 5.0.4. */
1338-
ut_a(!page || page_is_comp(page));
1339-
ut_a(!page_zip);
1340-
ptr = mlog_parse_index(ptr, end_ptr, TRUE, &index);
1341-
if (!ptr) {
1342-
break;
1343-
}
1344-
/* Fall through */
13451334
case MLOG_REC_SEC_DELETE_MARK:
13461335
ut_ad(!page || fil_page_type_is_index(page_type));
13471336
ptr = btr_cur_parse_del_mark_set_sec_rec(ptr, end_ptr,
@@ -3701,9 +3690,6 @@ get_mlog_string(mlog_id_t type)
37013690
case MLOG_COMP_REC_CLUST_DELETE_MARK:
37023691
return("MLOG_COMP_REC_CLUST_DELETE_MARK");
37033692

3704-
case MLOG_COMP_REC_SEC_DELETE_MARK:
3705-
return("MLOG_COMP_REC_SEC_DELETE_MARK");
3706-
37073693
case MLOG_COMP_REC_UPDATE_IN_PLACE:
37083694
return("MLOG_COMP_REC_UPDATE_IN_PLACE");
37093695

0 commit comments

Comments
 (0)