mirror of
https://github.com/MariaDB/server.git
synced 2026-05-16 20:07:13 +02:00
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:
commit
6645955abf
5 changed files with 11 additions and 4 deletions
|
|
@ -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);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue