1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
unknown 2001-10-11 12:09:44 +02:00
commit 6f3ecca91a
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
innobase/configure.in
View File

@ -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

4
innobase/os/os0file.c
View File

@ -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