diff options
author | unknown <heikki@hundin.mysql.fi> | 2005-03-03 17:50:04 +0200 |
---|---|---|
committer | unknown <heikki@hundin.mysql.fi> | 2005-03-03 17:50:04 +0200 |
commit | f3d52f8c8c9889c2882f39fd31c63d588783ea3a (patch) | |
tree | 66f490fbb84f68e59fea82a4dcf1fd750a9e941f /innobase | |
parent | 4e4fbf4839a75e91bd29d1747b6c093cbb1ca7bc (diff) | |
parent | afc8527360149323c2f2d34633ec67d10135b224 (diff) | |
download | mariadb-git-f3d52f8c8c9889c2882f39fd31c63d588783ea3a.tar.gz |
Merge
innobase/os/os0file.c:
Auto merged
innobase/srv/srv0start.c:
SCCS merged
Diffstat (limited to 'innobase')
-rw-r--r-- | innobase/os/os0file.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/innobase/os/os0file.c b/innobase/os/os0file.c index 93a914b8bbd..cc743ffad41 100644 --- a/innobase/os/os0file.c +++ b/innobase/os/os0file.c @@ -299,15 +299,6 @@ 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); } |