diff options
| author | monty@mysql.com <> | 2004-05-28 02:04:07 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-05-28 02:04:07 +0300 |
| commit | be7f1a3570d6a8683c4af8e93cec57cb28464556 (patch) | |
| tree | 57520d313686fb3d1f49b42e3164b95ea6835082 /innobase | |
| parent | 297be7107881e9bf72befa43d0785e599a612f67 (diff) | |
| parent | 33dcccb5bfa027440f9e8ed06cc342bced9041e0 (diff) | |
| download | mariadb-git-be7f1a3570d6a8683c4af8e93cec57cb28464556.tar.gz | |
merge with 4.0 to get fix for hpux
Diffstat (limited to 'innobase')
| -rw-r--r-- | innobase/os/os0file.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/innobase/os/os0file.c b/innobase/os/os0file.c index 5f5060c7464..a27da6d870e 100644 --- a/innobase/os/os0file.c +++ b/innobase/os/os0file.c @@ -1740,7 +1740,7 @@ os_file_pread( os_n_file_reads++; -#ifdef HAVE_PREAD +#if defined(HAVE_PREAD) && !defined(HAVE_BROKEN_PREAD) os_mutex_enter(os_file_count_mutex); os_file_n_pending_preads++; os_mutex_exit(os_file_count_mutex); @@ -1815,7 +1815,7 @@ os_file_pwrite( os_n_file_writes++; -#ifdef HAVE_PWRITE +#if defined(HAVE_PWRITE) && !defined(HAVE_BROKEN_PREAD) os_mutex_enter(os_file_count_mutex); os_file_n_pending_pwrites++; os_mutex_exit(os_file_count_mutex); |