Skip to content

Commit 14a8b70

Browse files
committed
Cleanup: Remove unused OS_DATA_TEMP_FILE
This had been originally added in mysql/mysql-server@192bb15 with the motivation to disable O_DIRECT for the dedicated tablespace for temporary tables. In MariaDB Server, commit 5eb5395 (MDEV-12227) should be a better solution. The code became orphaned later in mysql/mysql-server@c61244c and it had been applied to MariaDB Server 10.2.2 in commit 2e814d4 and commit fec844a. Thanks to Vladislav Vaintroub for spotting this.
1 parent c9ba668 commit 14a8b70

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

storage/innobase/include/os0file.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
33
Copyright (c) 1995, 2017, Oracle and/or its affiliates. All Rights Reserved.
44
Copyright (c) 2009, Percona Inc.
5-
Copyright (c) 2013, 2020, MariaDB Corporation.
5+
Copyright (c) 2013, 2021, MariaDB Corporation.
66
77
Portions of this file contain modifications contributed and copyrighted
88
by Percona Inc.. Those modifications are
@@ -160,7 +160,6 @@ static const ulint OS_FILE_NORMAL = 62;
160160
/** Types for file create @{ */
161161
static const ulint OS_DATA_FILE = 100;
162162
static const ulint OS_LOG_FILE = 101;
163-
static const ulint OS_DATA_TEMP_FILE = 102;
164163
static const ulint OS_DATA_FILE_NO_O_DIRECT = 103;
165164
/* @} */
166165

storage/innobase/os/os0file.cc

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
33
Copyright (c) 1995, 2019, Oracle and/or its affiliates. All Rights Reserved.
44
Copyright (c) 2009, Percona Inc.
5-
Copyright (c) 2013, 2020, MariaDB Corporation.
5+
Copyright (c) 2013, 2021, MariaDB Corporation.
66
77
Portions of this file contain modifications contributed and copyrighted
88
by Percona Inc.. Those modifications are
@@ -3007,7 +3007,6 @@ os_file_create_func(
30073007

30083008
ut_a(type == OS_LOG_FILE
30093009
|| type == OS_DATA_FILE
3010-
|| type == OS_DATA_TEMP_FILE
30113010
|| type == OS_DATA_FILE_NO_O_DIRECT);
30123011

30133012
ut_a(purpose == OS_FILE_AIO || purpose == OS_FILE_NORMAL);
@@ -3055,7 +3054,7 @@ os_file_create_func(
30553054
/* We disable OS caching (O_DIRECT) only on data files */
30563055
if (!read_only
30573056
&& *success
3058-
&& (type != OS_LOG_FILE && type != OS_DATA_TEMP_FILE
3057+
&& (type != OS_LOG_FILE
30593058
&& type != OS_DATA_FILE_NO_O_DIRECT)
30603059
&& (srv_file_flush_method == SRV_O_DIRECT
30613060
|| srv_file_flush_method == SRV_O_DIRECT_NO_FSYNC)) {

0 commit comments

Comments
 (0)