diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-13 13:39:47 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-13 13:39:47 +0000 |
| commit | 00d8329673e49f802186a07a2f878f0d034b118f (patch) | |
| tree | 8e219ebc4f9dfdad63d7df9a8d886fcdd9a1b8e0 /debian/patches/3039-os-data-file-no-o-direct.patch | |
| parent | Adding debian version 1:10.11.7-1. (diff) | |
| download | mariadb-00d8329673e49f802186a07a2f878f0d034b118f.tar.xz mariadb-00d8329673e49f802186a07a2f878f0d034b118f.zip | |
Adding debian version 1:10.11.7-2.debian/1%10.11.7-2
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/3039-os-data-file-no-o-direct.patch')
| -rw-r--r-- | debian/patches/3039-os-data-file-no-o-direct.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/debian/patches/3039-os-data-file-no-o-direct.patch b/debian/patches/3039-os-data-file-no-o-direct.patch new file mode 100644 index 00000000..3a55269f --- /dev/null +++ b/debian/patches/3039-os-data-file-no-o-direct.patch @@ -0,0 +1,32 @@ +Forwarded: https://github.com/MariaDB/server/pull/3039 +Origin: https://patch-diff.githubusercontent.com/raw/MariaDB/server/pull/3039.patch +From: Daniel Black <daniel@mariadb.org> +Date: Fri, 2 Feb 2024 11:38:00 +1100 +Subject: [PATCH] MDEV-33095 MariaDB-backup - no OS_DATA_FILE_NO_O_DIRECT on + some platforms + +Postfix for a6290a5bc5f3cba096854595c354d19d9267743d, in 10.11 +where OS_DATA_FILE_NO_O_DIRECT gets used. Same #ifdef conditions +as other uses of OS_DATA_FILE_NO_O_DIRECT. + +Noticed on aarch64-macos builder. +--- + extra/mariabackup/xtrabackup.cc | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +--- a/extra/mariabackup/xtrabackup.cc ++++ b/extra/mariabackup/xtrabackup.cc +@@ -2428,7 +2428,12 @@ static bool innodb_init() + os_file_delete_if_exists_func(ib_logfile0.c_str(), nullptr); + os_file_t file= os_file_create_func(ib_logfile0.c_str(), + OS_FILE_CREATE, OS_FILE_NORMAL, +- OS_DATA_FILE_NO_O_DIRECT, false, &ret); ++#if defined _WIN32 || defined HAVE_FCNTL_DIRECT ++ OS_DATA_FILE_NO_O_DIRECT, ++#else ++ OS_DATA_FILE, ++#endif ++ false, &ret); + if (!ret) + { + invalid_log: |