summaryrefslogtreecommitdiff
path: root/innobase/os
diff options
context:
space:
mode:
authormonty@hundin.mysql.fi <>2002-01-02 21:34:12 +0200
committermonty@hundin.mysql.fi <>2002-01-02 21:34:12 +0200
commitfd0459a521f832eb6d6106d8f813a1a798b1676e (patch)
tree8dbf52f0dc71a962692f98d1363958acf5d8fd67 /innobase/os
parent4b877e0088e6f32a606ffaa0fb3c94afb0b24388 (diff)
parent89f8ca058e3c548fa23b7a4aeb5662425d3d83b0 (diff)
downloadmariadb-git-fd0459a521f832eb6d6106d8f813a1a798b1676e.tar.gz
merge with 3.23
Diffstat (limited to 'innobase/os')
-rw-r--r--innobase/os/os0file.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/innobase/os/os0file.c b/innobase/os/os0file.c
index a7cd31af2ee..ac29b292f6a 100644
--- a/innobase/os/os0file.c
+++ b/innobase/os/os0file.c
@@ -581,6 +581,13 @@ os_file_flush(
return(TRUE);
}
+ /* Since Linux returns EINVAL if the 'file' is actually a raw device,
+ we choose to ignore that error */
+
+ if (errno == EINVAL) {
+ return(TRUE);
+ }
+
fprintf(stderr,
"InnoDB: Error: the OS said file flush did not succeed\n");