summaryrefslogtreecommitdiff
path: root/innobase
diff options
context:
space:
mode:
authorunknown <heikki@hundin.mysql.fi>2005-03-03 17:26:12 +0200
committerunknown <heikki@hundin.mysql.fi>2005-03-03 17:26:12 +0200
commit4e4fbf4839a75e91bd29d1747b6c093cbb1ca7bc (patch)
tree1bf2324cf7c0998fe15c1e686f2f6df572e02c1f /innobase
parent85f94ce9926fda357626ec5a58937ae58873cad2 (diff)
parent969be90f71894240a048e26c8ea7d0cbbb5d888b (diff)
downloadmariadb-git-4e4fbf4839a75e91bd29d1747b6c093cbb1ca7bc.tar.gz
Merge hundin.mysql.fi:/home/heikki/mysql-4.0
into hundin.mysql.fi:/home/heikki/mysql-4.1 innobase/os/os0file.c: Auto merged
Diffstat (limited to 'innobase')
-rw-r--r--innobase/os/os0file.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/innobase/os/os0file.c b/innobase/os/os0file.c
index cc743ffad41..93a914b8bbd 100644
--- a/innobase/os/os0file.c
+++ b/innobase/os/os0file.c
@@ -299,6 +299,15 @@ os_file_get_last_error(
return(OS_FILE_NOT_FOUND);
} else if (err == EEXIST) {
return(OS_FILE_ALREADY_EXISTS);
+#ifdef UNIV_AIX
+ } else if (err == 0) {
+ fprintf(stderr,
+"InnoDB: errno is 0. Since AIX 5.1 after security patch ML7 erroneously\n"
+"InnoDB: sets errno to 0 when it should be EEXIST, we assume that the real\n"
+"InnoDB: error here was EEXIST.\n");
+
+ return(OS_FILE_ALREADY_EXISTS);
+#endif
} else {
return(100 + err);
}