diff options
| author | unknown <monty@work.mysql.com> | 2001-10-11 12:09:44 +0200 |
|---|---|---|
| committer | unknown <monty@work.mysql.com> | 2001-10-11 12:09:44 +0200 |
| commit | 6f3ecca91a9b634e16bb8cee6cac2c8b74e877d2 (patch) | |
| tree | 8b3c6bed26bd57d3aa875a683db9a354f126b946 /innobase | |
| parent | 7b4549e6a094d6a77fdcb73820057a7a5e1310f6 (diff) | |
| parent | 6f2d56162b2b3c1117780ddc2686a5369bd172db (diff) | |
| download | mariadb-git-6f3ecca91a9b634e16bb8cee6cac2c8b74e877d2.tar.gz | |
merge
Diffstat (limited to 'innobase')
| -rw-r--r-- | innobase/configure.in | 2 | ||||
| -rw-r--r-- | innobase/os/os0file.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/innobase/configure.in b/innobase/configure.in index 48bb9504219..b606ecfffc0 100644 --- a/innobase/configure.in +++ b/innobase/configure.in @@ -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 diff --git a/innobase/os/os0file.c b/innobase/os/os0file.c index 70813f2f7e1..ced601d4de1 100644 --- a/innobase/os/os0file.c +++ b/innobase/os/os0file.c @@ -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 |