Commit 14eacb86 authored by unknown's avatar unknown
Browse files

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
parents 75b5e9d3 433430f4

innobase/os/os0file.c

+10 −1
Original line number Diff line number Diff line
@@ -394,10 +394,19 @@ os_file_lock( 
	lk.l_start = lk.l_len = 0;

	if (fcntl(fd, F_SETLK, &lk) == -1) {

		fprintf(stderr,

			"InnoDB: Unable to lock %s, error: %d", name, errno);

			"InnoDB: Unable to lock %s, error: %d\n", name, errno);



		if (errno == EAGAIN || errno == EACCES) {

			fprintf(stderr,

"InnoDB: Check that you do not already have another mysqld process\n"

"InnoDB: using the same InnoDB data or log files.\n");

		}



		close(fd);



		return(-1);

	}



	return(0);

}

#endif /* USE_FILE_LOCK */