manual.texi Had to revert name back to innodb_unix_file_flush_method because...

manual.texi	Had to revert name back to innodb_unix_file_flush_method because one line in mysqld.cc was not changed in 3.23.39
mysqld.cc	Had to revert name back to innodb_unix_file_flush_method because one line in mysqld.cc was not changed in 3.23.39


sql/mysqld.cc:
  Had to revert name back to innodb_unix_file_flush_method because one line in mysqld.cc was not changed in 3.23.39
Docs/manual.texi:
  Had to revert name back to innodb_unix_file_flush_method because one line in mysqld.cc was not changed in 3.23.39

Docs/manual.texi

@@ -25754,7 +25754,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_flush_method} @tab
+@item @code{innodb_unix_file_flush_method} @tab
 (Available from 3.23.39 up.)
 The default value for this is @code{fdatasync}.
 Another option is @code{O_DSYNC}.
@@ -26365,7 +26365,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_flush_method} in @file{my.cnf}
+try setting @code{innodb_unix_file_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

sql/mysqld.cc

@@ -2796,7 +2796,7 @@ struct show_var_st init_vars[]= {
   {"innodb_log_arch_dir",   (char*) &innobase_log_arch_dir, 	    SHOW_CHAR_PTR},
   {"innodb_log_archive",    (char*) &innobase_log_archive, 	    SHOW_MY_BOOL},
   {"innodb_log_group_home_dir", (char*) &innobase_log_group_home_dir, SHOW_CHAR_PTR},
-  {"innodb_flush_method",    (char*) &innobase_unix_file_flush_method, SHOW_CHAR_PTR},
+  {"innodb_unix_file_flush_method",    (char*) &innobase_unix_file_flush_method, SHOW_CHAR_PTR},
 #endif
   {"interactive_timeout",     (char*) &net_interactive_timeout,     SHOW_LONG},
   {"join_buffer_size",        (char*) &join_buff_size,              SHOW_LONG},
@@ -3073,7 +3073,7 @@ static void usage(void)
   puts("\
   --innodb_data_home_dir=dir   The common part for Innodb table spaces\n\
   --innodb_data_file_path=dir  Path to individual files and their sizes\n\
-  --innodb_flush_method=#      Which method to flush data\n\
+  --innodb_unix_file_flush_method=#  With which method to flush data\n\
   --innodb_flush_log_at_trx_commit[=#]\n\
 			       Set to 0 if you don't want to flush logs\n\
   --innodb_log_arch_dir=dir    Where full logs should be archived\n\