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
This commit is contained in:
unknown 2004-05-28 02:04:07 +03:00
commit 6645955abf
5 changed files with 11 additions and 4 deletions

View file

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