diff options
| author | unknown <monty@mysql.com> | 2004-05-28 02:04:07 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-05-28 02:04:07 +0300 |
| commit | 6645955abf228aa8bd5070651f7473fe81319803 (patch) | |
| tree | 57520d313686fb3d1f49b42e3164b95ea6835082 /innobase | |
| parent | 935a801a8a0d2bfadf65d60c7ee21f4253f1c373 (diff) | |
| parent | d1306dfa9df20972f20d1973042e0164a3183919 (diff) | |
| download | mariadb-git-6645955abf228aa8bd5070651f7473fe81319803.tar.gz | |
merge with 4.0 to get fix for hpux
configure.in:
Auto merged
innobase/os/os0file.c:
Auto merged
mysql-test/t/variables.test:
Auto merged
mysql-test/r/variables.result:
merge fix
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); |