Commit 4e4fbf48 authored by unknown's avatar unknown
Browse files

Merge hundin.mysql.fi:/home/heikki/mysql-4.0 

into hundin.mysql.fi:/home/heikki/mysql-4.1


innobase/os/os0file.c:
  Auto merged
parents 85f94ce9 969be90f

innobase/os/os0file.c

+9 −0
Original line number Diff line number Diff line
@@ -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);

	}