File tree Expand file tree Collapse file tree 2 files changed +2
-24
lines changed Expand file tree Collapse file tree 2 files changed +2
-24
lines changed Original file line number Diff line number Diff line change @@ -2982,8 +2982,6 @@ fil_ibd_open(
2982
2982
ut_ad (srv_log_file_size != 0 );
2983
2983
}
2984
2984
2985
- ut_ad (fil_type_is_data (purpose));
2986
-
2987
2985
/* Table flags can be ULINT_UNDEFINED if
2988
2986
dict_tf_to_fsp_flags_failure is set. */
2989
2987
if (flags == ULINT_UNDEFINED) {
@@ -4017,8 +4015,7 @@ fil_io(
4017
4015
4018
4016
/* Open file if closed */
4019
4017
if (!fil_node_prepare_for_io (node, space)) {
4020
- if (fil_type_is_data (space->purpose )
4021
- && fil_is_user_tablespace_id (space->id )) {
4018
+ if (fil_is_user_tablespace_id (space->id )) {
4022
4019
mutex_exit (&fil_system.mutex );
4023
4020
4024
4021
if (!ignore) {
@@ -4044,11 +4041,7 @@ fil_io(
4044
4041
ut_a (0 );
4045
4042
}
4046
4043
4047
- /* Check that at least the start offset is within the bounds of a
4048
- single-table tablespace, including rollback tablespaces. */
4049
- if (node->size <= cur_page_no
4050
- && space->id != TRX_SYS_SPACE
4051
- && fil_type_is_data (space->purpose )) {
4044
+ if (space->id && node->size <= cur_page_no) {
4052
4045
if (ignore) {
4053
4046
/* If we can tolerate the non-existent pages, we
4054
4047
should return with DB_ERROR and let caller decide
Original file line number Diff line number Diff line change @@ -60,21 +60,6 @@ enum fil_type_t {
60
60
FIL_TYPE_TABLESPACE,
61
61
};
62
62
63
- /* * Check if fil_type is any of FIL_TYPE_TEMPORARY, FIL_TYPE_IMPORT
64
- or FIL_TYPE_TABLESPACE.
65
- @param[in] type variable of type fil_type_t
66
- @return true if any of FIL_TYPE_TEMPORARY, FIL_TYPE_IMPORT
67
- or FIL_TYPE_TABLESPACE */
68
- inline
69
- bool
70
- fil_type_is_data (
71
- fil_type_t type)
72
- {
73
- return (type == FIL_TYPE_TEMPORARY
74
- || type == FIL_TYPE_IMPORT
75
- || type == FIL_TYPE_TABLESPACE);
76
- }
77
-
78
63
struct fil_node_t ;
79
64
80
65
#endif
You can’t perform that action at this time.
0 commit comments