Commit 08e18c29 authored by unknown's avatar unknown

Merge hundin.mysql.fi:/home/marko/mysql-4.1

into  hundin.mysql.fi:/home/marko/mysql-5.0


innobase/include/os0file.h:
  Automerge and manual fix
innobase/os/os0file.c:
  Automerged
innobase/trx/trx0sys.c:
  Automerged
parents 71b0f8f0 4db445b9
...@@ -19,7 +19,9 @@ Created 10/21/1995 Heikki Tuuri ...@@ -19,7 +19,9 @@ Created 10/21/1995 Heikki Tuuri
typedef struct fil_node_struct fil_node_t; typedef struct fil_node_struct fil_node_t;
#ifdef UNIV_DO_FLUSH
extern ibool os_do_not_call_flush_at_each_write; extern ibool os_do_not_call_flush_at_each_write;
#endif /* UNIV_DO_FLUSH */
extern ibool os_has_said_disk_full; extern ibool os_has_said_disk_full;
extern ibool os_aio_print_debug; extern ibool os_aio_print_debug;
......
...@@ -40,9 +40,13 @@ ulint os_innodb_umask = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP; ...@@ -40,9 +40,13 @@ ulint os_innodb_umask = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP;
ulint os_innodb_umask = 0; ulint os_innodb_umask = 0;
#endif #endif
#ifdef UNIV_DO_FLUSH
/* If the following is set to TRUE, we do not call os_file_flush in every /* If the following is set to TRUE, we do not call os_file_flush in every
os_file_write. We can set this TRUE when the doublewrite buffer is used. */ os_file_write. We can set this TRUE when the doublewrite buffer is used. */
ibool os_do_not_call_flush_at_each_write = FALSE; ibool os_do_not_call_flush_at_each_write = FALSE;
#else
/* We do not call os_file_flush in every os_file_write. */
#endif /* UNIV_DO_FLUSH */
/* We use these mutexes to protect lseek + file i/o operation, if the /* We use these mutexes to protect lseek + file i/o operation, if the
OS does not provide an atomic pread or pwrite, or similar */ OS does not provide an atomic pread or pwrite, or similar */
...@@ -1985,6 +1989,7 @@ os_file_pwrite( ...@@ -1985,6 +1989,7 @@ os_file_pwrite(
os_file_n_pending_pwrites--; os_file_n_pending_pwrites--;
os_mutex_exit(os_file_count_mutex); os_mutex_exit(os_file_count_mutex);
# ifdef UNIV_DO_FLUSH
if (srv_unix_file_flush_method != SRV_UNIX_LITTLESYNC if (srv_unix_file_flush_method != SRV_UNIX_LITTLESYNC
&& srv_unix_file_flush_method != SRV_UNIX_NOSYNC && srv_unix_file_flush_method != SRV_UNIX_NOSYNC
&& !os_do_not_call_flush_at_each_write) { && !os_do_not_call_flush_at_each_write) {
...@@ -1995,6 +2000,7 @@ os_file_pwrite( ...@@ -1995,6 +2000,7 @@ os_file_pwrite(
ut_a(TRUE == os_file_flush(file)); ut_a(TRUE == os_file_flush(file));
} }
# endif /* UNIV_DO_FLUSH */
return(ret); return(ret);
#else #else
...@@ -2017,6 +2023,7 @@ os_file_pwrite( ...@@ -2017,6 +2023,7 @@ os_file_pwrite(
ret = write(file, buf, (ssize_t)n); ret = write(file, buf, (ssize_t)n);
# ifdef UNIV_DO_FLUSH
if (srv_unix_file_flush_method != SRV_UNIX_LITTLESYNC if (srv_unix_file_flush_method != SRV_UNIX_LITTLESYNC
&& srv_unix_file_flush_method != SRV_UNIX_NOSYNC && srv_unix_file_flush_method != SRV_UNIX_NOSYNC
&& !os_do_not_call_flush_at_each_write) { && !os_do_not_call_flush_at_each_write) {
...@@ -2027,6 +2034,7 @@ os_file_pwrite( ...@@ -2027,6 +2034,7 @@ os_file_pwrite(
ut_a(TRUE == os_file_flush(file)); ut_a(TRUE == os_file_flush(file));
} }
# endif /* UNIV_DO_FLUSH */
os_mutex_exit(os_file_seek_mutexes[i]); os_mutex_exit(os_file_seek_mutexes[i]);
...@@ -2313,9 +2321,11 @@ os_file_write( ...@@ -2313,9 +2321,11 @@ os_file_write(
/* Always do fsync to reduce the probability that when the OS crashes, /* Always do fsync to reduce the probability that when the OS crashes,
a database page is only partially physically written to disk. */ a database page is only partially physically written to disk. */
# ifdef UNIV_DO_FLUSH
if (!os_do_not_call_flush_at_each_write) { if (!os_do_not_call_flush_at_each_write) {
ut_a(TRUE == os_file_flush(file)); ut_a(TRUE == os_file_flush(file));
} }
# endif /* UNIV_DO_FLUSH */
os_mutex_exit(os_file_seek_mutexes[i]); os_mutex_exit(os_file_seek_mutexes[i]);
...@@ -3533,10 +3543,12 @@ os_aio_windows_handle( ...@@ -3533,10 +3543,12 @@ os_aio_windows_handle(
if (ret && len == slot->len) { if (ret && len == slot->len) {
ret_val = TRUE; ret_val = TRUE;
# ifdef UNIV_DO_FLUSH
if (slot->type == OS_FILE_WRITE if (slot->type == OS_FILE_WRITE
&& !os_do_not_call_flush_at_each_write) { && !os_do_not_call_flush_at_each_write) {
ut_a(TRUE == os_file_flush(slot->file)); ut_a(TRUE == os_file_flush(slot->file));
} }
# endif /* UNIV_DO_FLUSH */
} else { } else {
os_file_handle_error(slot->name, "Windows aio"); os_file_handle_error(slot->name, "Windows aio");
...@@ -3617,10 +3629,12 @@ os_aio_posix_handle( ...@@ -3617,10 +3629,12 @@ os_aio_posix_handle(
*message1 = slot->message1; *message1 = slot->message1;
*message2 = slot->message2; *message2 = slot->message2;
# ifdef UNIV_DO_FLUSH
if (slot->type == OS_FILE_WRITE if (slot->type == OS_FILE_WRITE
&& !os_do_not_call_flush_at_each_write) { && !os_do_not_call_flush_at_each_write) {
ut_a(TRUE == os_file_flush(slot->file)); ut_a(TRUE == os_file_flush(slot->file));
} }
# endif /* UNIV_DO_FLUSH */
os_mutex_exit(array->mutex); os_mutex_exit(array->mutex);
......
...@@ -97,8 +97,9 @@ trx_doublewrite_init( ...@@ -97,8 +97,9 @@ trx_doublewrite_init(
/* Since we now start to use the doublewrite buffer, no need to call /* Since we now start to use the doublewrite buffer, no need to call
fsync() after every write to a data file */ fsync() after every write to a data file */
#ifdef UNIV_DO_FLUSH
os_do_not_call_flush_at_each_write = TRUE; os_do_not_call_flush_at_each_write = TRUE;
#endif /* UNIV_DO_FLUSH */
mutex_create(&(trx_doublewrite->mutex)); mutex_create(&(trx_doublewrite->mutex));
mutex_set_level(&(trx_doublewrite->mutex), SYNC_DOUBLEWRITE); mutex_set_level(&(trx_doublewrite->mutex), SYNC_DOUBLEWRITE);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment