diff options
| -rw-r--r-- | BitKeeper/etc/logging_ok | 1 | ||||
| -rw-r--r-- | Docs/manual.texi | 4 | ||||
| -rw-r--r-- | innobase/include/page0cur.ic | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index e8deba03c8a..2ca78e17fab 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -1 +1,2 @@ monty@hundin.mysql.fi +heikki@donna.mysql.fi diff --git a/Docs/manual.texi b/Docs/manual.texi index 76e84b4cdad..49e13c7d3b4 100644 --- a/Docs/manual.texi +++ b/Docs/manual.texi @@ -25727,7 +25727,7 @@ in its own lock table and rolls back the transaction. If you use than InnoDB in the same transaction, then a deadlock may arise which InnoDB cannot notice. In cases like this the timeout is useful to resolve the situation. -@item @code{innodb_unix_file_flush_method} @tab +@item @code{innodb_flush_method} @tab (Available from 3.23.39 up.) The default value for this is @code{fdatasync}. Another option is @code{O_DSYNC}. @@ -26338,7 +26338,7 @@ In some versions of Linux and Unix, flushing files to disk with the Unix @code{fdatasync} and other similar methods is surprisingly slow. The default method InnoDB uses is the @code{fdatasync} function. If you are not satisfied with the database write performance, you may -try setting @code{innodb_unix_file_flush_method} in @file{my.cnf} +try setting @code{innodb_flush_method} in @file{my.cnf} to @code{O_DSYNC}, though O_DSYNC seems to be slower on most systems. You can also try setting it to @code{littlesync}, which means that InnoDB does not call the file flush for every write it does to a diff --git a/innobase/include/page0cur.ic b/innobase/include/page0cur.ic index 4313036adaf..39f8ab11513 100644 --- a/innobase/include/page0cur.ic +++ b/innobase/include/page0cur.ic @@ -171,10 +171,10 @@ page_cur_search( ut_ad(dtuple_check_typed(tuple)); page_cur_search_with_match(page, tuple, mode, - &low_matched_fields, - &low_matched_bytes, &up_matched_fields, &up_matched_bytes, + &low_matched_fields, + &low_matched_bytes, cursor); return(low_matched_fields); } |