Commit 24fe09ac authored by monty@work.mysql.com's avatar monty@work.mysql.com
Browse files

merge

parents d121c2cd 6a3f93f4

innobase/configure.in

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ AC_CHECK_HEADERS(aio.h sched.h) 
AC_CHECK_SIZEOF(int, 4)

AC_CHECK_FUNCS(sched_yield)

AC_CHECK_FUNCS(fdatasync)

AC_CHECK_FUNCS(localtime_r)

#AC_CHECK_FUNCS(localtime_r)	# Already checked by MySQL

#AC_C_INLINE  Already checked in MySQL

AC_C_BIGENDIAN

innobase/os/os0file.c

+4 −0
Original line number Diff line number Diff line
@@ -603,6 +603,7 @@ os_file_pread( 
#ifdef HAVE_PREAD

	return(pread(file, buf, n, offs));

#else

	{

	ssize_t	ret;

	ulint	i;
@@ -624,6 +625,7 @@ os_file_pread( 
	os_mutex_exit(os_file_seek_mutexes[i]);



	return(ret);

	}

#endif

}
@@ -660,6 +662,7 @@ os_file_pwrite( 


        return(ret);

#else

	{

	ulint	i;



	/* Protect the seek / write operation with a mutex */
@@ -691,6 +694,7 @@ os_file_pwrite( 
	os_mutex_exit(os_file_seek_mutexes[i]);



	return(ret);

	}

#endif

}

#endif