Commit 507dbe23 authored by unknown's avatar unknown
Browse files

Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0 

into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-5.0
parents d3f5dfbd 0f49bc7f

sql/mysqld.cc

+3 −3
Original line number Diff line number Diff line
@@ -4415,6 +4415,9 @@ Disable with --skip-large-pages.", 
Disable with --skip-innodb (will save memory).",

   (gptr*) &opt_innodb, (gptr*) &opt_innodb, 0, GET_BOOL, NO_ARG, OPT_INNODB_DEFAULT, 0, 0,

   0, 0, 0},

  {"innodb_checksums", OPT_INNODB_CHECKSUMS, "Enable InnoDB checksums validation (enabled by default). \

Disable with --skip-innodb-checksums.", (gptr*) &innobase_use_checksums,

   (gptr*) &innobase_use_checksums, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0},

  {"innodb_data_file_path", OPT_INNODB_DATA_FILE_PATH,

   "Path to individual files and their sizes.",

   0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
@@ -4426,9 +4429,6 @@ Disable with --skip-innodb (will save memory).", 
  {"innodb_doublewrite", OPT_INNODB_DOUBLEWRITE, "Enable InnoDB doublewrite buffer (enabled by default). \

Disable with --skip-innodb-doublewrite.", (gptr*) &innobase_use_doublewrite,

   (gptr*) &innobase_use_doublewrite, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0},

  {"innodb_checksums", OPT_INNODB_CHECKSUMS, "Enable InnoDB checksums validation (enabled by default). \

Disable with --skip-innodb-checksums.", (gptr*) &innobase_use_checksums,

   (gptr*) &innobase_use_checksums, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0},

  {"innodb_fast_shutdown", OPT_INNODB_FAST_SHUTDOWN,

   "Speeds up server shutdown process.", (gptr*) &innobase_fast_shutdown,

   (gptr*) &innobase_fast_shutdown, 0, GET_BOOL, OPT_ARG, 1, 0, 0, 0, 0, 0},