Commit 217d9055 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/extern/mysql/bk/mysql-5.0 

into  mysql.com:/extern/mysql/work/bug15658/mysql-5.0
parents b60fc2ce de931855

sql/mysqld.cc

+1 −1
Original line number Diff line number Diff line
@@ -4825,7 +4825,7 @@ Disable with --skip-innodb-doublewrite.", (gptr*) &innobase_use_doublewrite, 
   "Set to 0 (write and flush once per second), 1 (write and flush at each commit) or 2 (write at commit, flush once per second).",

   (gptr*) &srv_flush_log_at_trx_commit,

   (gptr*) &srv_flush_log_at_trx_commit,

   0, GET_UINT, OPT_ARG,  1, 0, 2, 0, 0, 0},

   0, GET_ULONG, OPT_ARG,  1, 0, 2, 0, 0, 0},

  {"innodb_flush_method", OPT_INNODB_FLUSH_METHOD,

   "With which method to flush data.", (gptr*) &innobase_unix_file_flush_method,

   (gptr*) &innobase_unix_file_flush_method, 0, GET_STR, REQUIRED_ARG, 0, 0, 0,