Commit 3bb0223e authored by unknown's avatar unknown
Browse files

mysqld.cc: 

  System variable names use underscores, not dashes.
  Alphabetize variables in option struct for help message.

(will wait for okay to push)


sql/mysqld.cc:
  System variable names use underscores, not dashes.
  Alphabetize variables in option struct for help message.
parent 61441468

sql/mysqld.cc

+108 −108
Original line number Diff line number Diff line
@@ -4562,6 +4562,10 @@ replicating a LOAD DATA INFILE command.", 
    "The buffer that is allocated to cache index and rows for BDB tables.",

    (gptr*) &berkeley_cache_size, (gptr*) &berkeley_cache_size, 0, GET_ULONG,

    REQUIRED_ARG, KEY_CACHE_SIZE, 20*1024, (long) ~0, 0, IO_SIZE, 0},

  /* QQ: The following should be removed soon! (bdb_max_lock preferred) */

  {"bdb_lock_max", OPT_BDB_MAX_LOCK, "Synonym for bdb_max_lock.",

   (gptr*) &berkeley_max_lock, (gptr*) &berkeley_max_lock, 0, GET_ULONG,

   REQUIRED_ARG, 10000, 0, (long) ~0, 0, 1, 0},

  {"bdb_log_buffer_size", OPT_BDB_LOG_BUFFER_SIZE,

   "The buffer that is allocated to cache index and rows for BDB tables.",

   (gptr*) &berkeley_log_buffer_size, (gptr*) &berkeley_log_buffer_size, 0,
@@ -4570,15 +4574,16 @@ replicating a LOAD DATA INFILE command.", 
   "The maximum number of locks you can have active on a BDB table.",

   (gptr*) &berkeley_max_lock, (gptr*) &berkeley_max_lock, 0, GET_ULONG,

   REQUIRED_ARG, 10000, 0, (long) ~0, 0, 1, 0},

  /* QQ: The following should be removed soon! */

  {"bdb_lock_max", OPT_BDB_MAX_LOCK, "Synonym for bdb_max_lock.",

   (gptr*) &berkeley_max_lock, (gptr*) &berkeley_max_lock, 0, GET_ULONG,

   REQUIRED_ARG, 10000, 0, (long) ~0, 0, 1, 0},

#endif /* HAVE_BERKELEY_DB */

  {"binlog_cache_size", OPT_BINLOG_CACHE_SIZE,

   "The size of the cache to hold the SQL statements for the binary log during a transaction. If you often use big, multi-statement transactions you can increase this to get more performance.",

   (gptr*) &binlog_cache_size, (gptr*) &binlog_cache_size, 0, GET_ULONG,

   REQUIRED_ARG, 32*1024L, IO_SIZE, ~0L, 0, IO_SIZE, 0},

  {"bulk_insert_buffer_size", OPT_BULK_INSERT_BUFFER_SIZE,

   "Size of tree cache used in bulk insert optimisation. Note that this is a limit per thread!",

   (gptr*) &global_system_variables.bulk_insert_buff_size,

   (gptr*) &max_system_variables.bulk_insert_buff_size,

   0, GET_ULONG, REQUIRED_ARG, 8192*1024, 0, ~0L, 0, 1, 0},

  {"connect_timeout", OPT_CONNECT_TIMEOUT,

   "The number of seconds the mysqld server is waiting for a connect packet before responding with 'Bad handshake'.",

    (gptr*) &connect_timeout, (gptr*) &connect_timeout,
@@ -4589,18 +4594,38 @@ replicating a LOAD DATA INFILE command.", 
   (gptr*) &opt_crash_binlog_innodb, (gptr*) &opt_crash_binlog_innodb,

   0, GET_UINT, REQUIRED_ARG, 0, 0, ~(uint)0, 0, 1, 0},

#endif

  {"delayed_insert_timeout", OPT_DELAYED_INSERT_TIMEOUT,

   "How long a INSERT DELAYED thread should wait for INSERT statements before terminating.",

   (gptr*) &delayed_insert_timeout, (gptr*) &delayed_insert_timeout, 0,

   GET_ULONG, REQUIRED_ARG, DELAYED_WAIT_TIMEOUT, 1, LONG_TIMEOUT, 0, 1, 0},

  { "date_format", OPT_DATE_FORMAT,

    "The DATE format (For future).",

    (gptr*) &opt_date_time_formats[MYSQL_TIMESTAMP_DATE],

    (gptr*) &opt_date_time_formats[MYSQL_TIMESTAMP_DATE],

    0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

  { "datetime_format", OPT_DATETIME_FORMAT,

    "The DATETIME/TIMESTAMP format (for future).",

    (gptr*) &opt_date_time_formats[MYSQL_TIMESTAMP_DATETIME],

    (gptr*) &opt_date_time_formats[MYSQL_TIMESTAMP_DATETIME],

    0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

  { "default_week_format", OPT_DEFAULT_WEEK_FORMAT,

    "The default week format used by WEEK() functions.",

    (gptr*) &global_system_variables.default_week_format,

    (gptr*) &max_system_variables.default_week_format,

    0, GET_ULONG, REQUIRED_ARG, 0, 0, 7L, 0, 1, 0},

  {"delayed_insert_limit", OPT_DELAYED_INSERT_LIMIT,

   "After inserting delayed_insert_limit rows, the INSERT DELAYED handler will check if there are any SELECT statements pending. If so, it allows these to execute before continuing.",

    (gptr*) &delayed_insert_limit, (gptr*) &delayed_insert_limit, 0, GET_ULONG,

    REQUIRED_ARG, DELAYED_LIMIT, 1, ~0L, 0, 1, 0},

  {"delayed_insert_timeout", OPT_DELAYED_INSERT_TIMEOUT,

   "How long a INSERT DELAYED thread should wait for INSERT statements before terminating.",

   (gptr*) &delayed_insert_timeout, (gptr*) &delayed_insert_timeout, 0,

   GET_ULONG, REQUIRED_ARG, DELAYED_WAIT_TIMEOUT, 1, LONG_TIMEOUT, 0, 1, 0},

  { "delayed_queue_size", OPT_DELAYED_QUEUE_SIZE,

    "What size queue (in rows) should be allocated for handling INSERT DELAYED. If the queue becomes full, any client that does INSERT DELAYED will wait until there is room in the queue again.",

    (gptr*) &delayed_queue_size, (gptr*) &delayed_queue_size, 0, GET_ULONG,

    REQUIRED_ARG, DELAYED_QUEUE_SIZE, 1, ~0L, 0, 1, 0},

  {"expire_logs_days", OPT_EXPIRE_LOGS_DAYS,

   "Binary logs will be rotated after expire-log-days days ",

   (gptr*) &expire_logs_days,

   (gptr*) &expire_logs_days, 0, GET_ULONG,

   REQUIRED_ARG, 0, 0, 99, 0, 1, 0},

  { "flush_time", OPT_FLUSH_TIME,

    "A dedicated thread is created to flush all tables at the given interval.",

    (gptr*) &flush_time, (gptr*) &flush_time, 0, GET_ULONG, REQUIRED_ARG,
@@ -4609,14 +4634,14 @@ replicating a LOAD DATA INFILE command.", 
    "List of operators for MATCH ... AGAINST ( ... IN BOOLEAN MODE)",

    0, 0, 0, GET_STR,

    REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

  { "ft_min_word_len", OPT_FT_MIN_WORD_LEN,

    "The minimum length of the word to be included in a FULLTEXT index. Note: FULLTEXT indexes must be rebuilt after changing this variable.",

    (gptr*) &ft_min_word_len, (gptr*) &ft_min_word_len, 0, GET_ULONG,

    REQUIRED_ARG, 4, 1, HA_FT_MAXCHARLEN, 0, 1, 0},

  { "ft_max_word_len", OPT_FT_MAX_WORD_LEN,

    "The maximum length of the word to be included in a FULLTEXT index. Note: FULLTEXT indexes must be rebuilt after changing this variable.",

    (gptr*) &ft_max_word_len, (gptr*) &ft_max_word_len, 0, GET_ULONG,

    REQUIRED_ARG, HA_FT_MAXCHARLEN, 10, HA_FT_MAXCHARLEN, 0, 1, 0},

  { "ft_min_word_len", OPT_FT_MIN_WORD_LEN,

    "The minimum length of the word to be included in a FULLTEXT index. Note: FULLTEXT indexes must be rebuilt after changing this variable.",

    (gptr*) &ft_min_word_len, (gptr*) &ft_min_word_len, 0, GET_ULONG,

    REQUIRED_ARG, 4, 1, HA_FT_MAXCHARLEN, 0, 1, 0},

  { "ft_query_expansion_limit", OPT_FT_QUERY_EXPANSION_LIMIT,

    "Number of best matches to use for query expansion",

    (gptr*) &ft_query_expansion_limit, (gptr*) &ft_query_expansion_limit, 0, GET_ULONG,
@@ -4631,48 +4656,52 @@ replicating a LOAD DATA INFILE command.", 
    (gptr*) &max_system_variables.group_concat_max_len, 0, GET_ULONG,

    REQUIRED_ARG, 1024, 4, (long) ~0, 0, 1, 0},

#ifdef HAVE_INNOBASE_DB

  {"innodb_mirrored_log_groups", OPT_INNODB_MIRRORED_LOG_GROUPS,

   "Number of identical copies of log groups we keep for the database. Currently this should be set to 1.",

   (gptr*) &innobase_mirrored_log_groups,

   (gptr*) &innobase_mirrored_log_groups, 0, GET_LONG, REQUIRED_ARG, 1, 1, 10,

   0, 1, 0},

  {"innodb_log_files_in_group", OPT_INNODB_LOG_FILES_IN_GROUP,

   "Number of log files in the log group. InnoDB writes to the files in a circular fashion. Value 3 is recommended here.",

   (gptr*) &innobase_log_files_in_group, (gptr*) &innobase_log_files_in_group,

   0, GET_LONG, REQUIRED_ARG, 2, 2, 100, 0, 1, 0},

  {"innodb_log_file_size", OPT_INNODB_LOG_FILE_SIZE,

   "Size of each log file in a log group in megabytes.",

   (gptr*) &innobase_log_file_size, (gptr*) &innobase_log_file_size, 0,

   GET_LONG, REQUIRED_ARG, 5*1024*1024L, 1*1024*1024L, ~0L, 0, 1024*1024L, 0},

  {"innodb_log_buffer_size", OPT_INNODB_LOG_BUFFER_SIZE,

   "The size of the buffer which InnoDB uses to write log to the log files on disk.",

   (gptr*) &innobase_log_buffer_size, (gptr*) &innobase_log_buffer_size, 0,

   GET_LONG, REQUIRED_ARG, 1024*1024L, 256*1024L, ~0L, 0, 1024, 0},

  {"innodb_buffer_pool_size", OPT_INNODB_BUFFER_POOL_SIZE,

   "The size of the memory buffer InnoDB uses to cache data and indexes of its tables.",

   (gptr*) &innobase_buffer_pool_size, (gptr*) &innobase_buffer_pool_size, 0,

   GET_LONG, REQUIRED_ARG, 8*1024*1024L, 1024*1024L, ~0L, 0, 1024*1024L, 0},

  {"innodb_buffer_pool_awe_mem_mb", OPT_INNODB_BUFFER_POOL_AWE_MEM_MB,

   "If Windows AWE is used, the size of InnoDB buffer pool allocated from the AWE memory.",

   (gptr*) &innobase_buffer_pool_awe_mem_mb, (gptr*) &innobase_buffer_pool_awe_mem_mb, 0,

   GET_LONG, REQUIRED_ARG, 0, 0, 63000, 0, 1, 0},

  {"innodb_additional_mem_pool_size", OPT_INNODB_ADDITIONAL_MEM_POOL_SIZE,

   "Size of a memory pool InnoDB uses to store data dictionary information and other internal data structures.",

   (gptr*) &innobase_additional_mem_pool_size,

   (gptr*) &innobase_additional_mem_pool_size, 0, GET_LONG, REQUIRED_ARG,

   1*1024*1024L, 512*1024L, ~0L, 0, 1024, 0},

  {"innodb_buffer_pool_awe_mem_mb", OPT_INNODB_BUFFER_POOL_AWE_MEM_MB,

   "If Windows AWE is used, the size of InnoDB buffer pool allocated from the AWE memory.",

   (gptr*) &innobase_buffer_pool_awe_mem_mb, (gptr*) &innobase_buffer_pool_awe_mem_mb, 0,

   GET_LONG, REQUIRED_ARG, 0, 0, 63000, 0, 1, 0},

  {"innodb_buffer_pool_size", OPT_INNODB_BUFFER_POOL_SIZE,

   "The size of the memory buffer InnoDB uses to cache data and indexes of its tables.",

   (gptr*) &innobase_buffer_pool_size, (gptr*) &innobase_buffer_pool_size, 0,

   GET_LONG, REQUIRED_ARG, 8*1024*1024L, 1024*1024L, ~0L, 0, 1024*1024L, 0},

  {"innodb_file_io_threads", OPT_INNODB_FILE_IO_THREADS,

   "Number of file I/O threads in InnoDB.", (gptr*) &innobase_file_io_threads,

   (gptr*) &innobase_file_io_threads, 0, GET_LONG, REQUIRED_ARG, 4, 4, 64, 0,

   1, 0},

  {"innodb_open_files", OPT_INNODB_OPEN_FILES,

   "How many files at the maximum InnoDB keeps open at the same time.",

   (gptr*) &innobase_open_files, (gptr*) &innobase_open_files, 0,

   GET_LONG, REQUIRED_ARG, 300L, 10L, ~0L, 0, 1L, 0},

  {"innodb_force_recovery", OPT_INNODB_FORCE_RECOVERY,

   "Helps to save your data in case the disk image of the database becomes corrupt.",

   (gptr*) &innobase_force_recovery, (gptr*) &innobase_force_recovery, 0,

   GET_LONG, REQUIRED_ARG, 0, 0, 6, 0, 1, 0},

  {"innodb_lock_wait_timeout", OPT_INNODB_LOCK_WAIT_TIMEOUT,

   "Timeout in seconds an InnoDB transaction may wait for a lock before being rolled back.",

   (gptr*) &innobase_lock_wait_timeout, (gptr*) &innobase_lock_wait_timeout,

   0, GET_LONG, REQUIRED_ARG, 50, 1, 1024 * 1024 * 1024, 0, 1, 0},

  {"innodb_log_buffer_size", OPT_INNODB_LOG_BUFFER_SIZE,

   "The size of the buffer which InnoDB uses to write log to the log files on disk.",

   (gptr*) &innobase_log_buffer_size, (gptr*) &innobase_log_buffer_size, 0,

   GET_LONG, REQUIRED_ARG, 1024*1024L, 256*1024L, ~0L, 0, 1024, 0},

  {"innodb_log_file_size", OPT_INNODB_LOG_FILE_SIZE,

   "Size of each log file in a log group in megabytes.",

   (gptr*) &innobase_log_file_size, (gptr*) &innobase_log_file_size, 0,

   GET_LONG, REQUIRED_ARG, 5*1024*1024L, 1*1024*1024L, ~0L, 0, 1024*1024L, 0},

  {"innodb_log_files_in_group", OPT_INNODB_LOG_FILES_IN_GROUP,

   "Number of log files in the log group. InnoDB writes to the files in a circular fashion. Value 3 is recommended here.",

   (gptr*) &innobase_log_files_in_group, (gptr*) &innobase_log_files_in_group,

   0, GET_LONG, REQUIRED_ARG, 2, 2, 100, 0, 1, 0},

  {"innodb_mirrored_log_groups", OPT_INNODB_MIRRORED_LOG_GROUPS,

   "Number of identical copies of log groups we keep for the database. Currently this should be set to 1.",

   (gptr*) &innobase_mirrored_log_groups,

   (gptr*) &innobase_mirrored_log_groups, 0, GET_LONG, REQUIRED_ARG, 1, 1, 10,

   0, 1, 0},

  {"innodb_open_files", OPT_INNODB_OPEN_FILES,

   "How many files at the maximum InnoDB keeps open at the same time.",

   (gptr*) &innobase_open_files, (gptr*) &innobase_open_files, 0,

   GET_LONG, REQUIRED_ARG, 300L, 10L, ~0L, 0, 1L, 0},

#ifdef HAVE_REPLICATION

  /*

    Disabled for the 4.1.3 release. Disabling just this paragraph of code is
@@ -4697,10 +4726,6 @@ replicating a LOAD DATA INFILE command.", 
   "Helps in performance tuning in heavily concurrent environments.",

   (gptr*) &innobase_thread_concurrency, (gptr*) &innobase_thread_concurrency,

   0, GET_LONG, REQUIRED_ARG, 8, 1, 1000, 0, 1, 0},

  {"innodb_force_recovery", OPT_INNODB_FORCE_RECOVERY,

   "Helps to save your data in case the disk image of the database becomes corrupt.",

   (gptr*) &innobase_force_recovery, (gptr*) &innobase_force_recovery, 0,

   GET_LONG, REQUIRED_ARG, 0, 0, 6, 0, 1, 0},

#endif /* HAVE_INNOBASE_DB */

  {"interactive_timeout", OPT_INTERACTIVE_TIMEOUT,

   "The number of seconds the server waits for activity on an interactive connection before closing it.",
@@ -4720,6 +4745,12 @@ replicating a LOAD DATA INFILE command.", 
   0, (GET_ULL | GET_ASK_ADDR),

   REQUIRED_ARG, KEY_CACHE_SIZE, MALLOC_OVERHEAD, (long) ~0, MALLOC_OVERHEAD,

   IO_SIZE, 0},

  {"key_cache_age_threshold", OPT_KEY_CACHE_AGE_THRESHOLD,

   "This characterizes the number of hits a hot block has to be untouched until it is considered aged enough to be downgraded to a warm block. This specifies the percentage ratio of that number of hits to the total number of blocks in key cache",

   (gptr*) &dflt_key_cache_var.param_age_threshold,

   (gptr*) 0,

   0, (GET_ULONG | GET_ASK_ADDR), REQUIRED_ARG, 

   300, 100, ~0L, 0, 100, 0},

  {"key_cache_block_size", OPT_KEY_CACHE_BLOCK_SIZE,

   "The default size of key cache blocks",

   (gptr*) &dflt_key_cache_var.param_block_size,
@@ -4732,12 +4763,6 @@ replicating a LOAD DATA INFILE command.", 
   (gptr*) 0,

   0, (GET_ULONG | GET_ASK_ADDR) , REQUIRED_ARG, 100,

   1, 100, 0, 1, 0},

  {"key_cache_age_threshold", OPT_KEY_CACHE_AGE_THRESHOLD,

   "This characterizes the number of hits a hot block has to be untouched until it is considered aged enough to be downgraded to a warm block. This specifies the percentage ratio of that number of hits to the total number of blocks in key cache",

   (gptr*) &dflt_key_cache_var.param_age_threshold,

   (gptr*) 0,

   0, (GET_ULONG | GET_ASK_ADDR), REQUIRED_ARG, 

   300, 100, ~0L, 0, 100, 0},

  {"long_query_time", OPT_LONG_QUERY_TIME,

   "Log all queries that have taken more than long_query_time seconds to execute to file.",

   (gptr*) &global_system_variables.long_query_time,
@@ -4768,14 +4793,14 @@ value. Will also apply to relay logs if max_relay_log_size is 0. \ 
The minimum value for this variable is 4096.",

   (gptr*) &max_binlog_size, (gptr*) &max_binlog_size, 0, GET_ULONG,

   REQUIRED_ARG, 1024*1024L*1024L, IO_SIZE, 1024*1024L*1024L, 0, IO_SIZE, 0},

  {"max_connections", OPT_MAX_CONNECTIONS,

   "The number of simultaneous clients allowed.", (gptr*) &max_connections,

   (gptr*) &max_connections, 0, GET_ULONG, REQUIRED_ARG, 100, 1, 16384, 0, 1,

   0},

  {"max_connect_errors", OPT_MAX_CONNECT_ERRORS,

   "If there is more than this number of interrupted connections from a host this host will be blocked from further connections.",

   (gptr*) &max_connect_errors, (gptr*) &max_connect_errors, 0, GET_ULONG,

    REQUIRED_ARG, MAX_CONNECT_ERRORS, 1, ~0L, 0, 1, 0},

  {"max_connections", OPT_MAX_CONNECTIONS,

   "The number of simultaneous clients allowed.", (gptr*) &max_connections,

   (gptr*) &max_connections, 0, GET_ULONG, REQUIRED_ARG, 100, 1, 16384, 0, 1,

   0},

  {"max_delayed_threads", OPT_MAX_DELAYED_THREADS,

   "Don't start more than this number of threads to handle INSERT DELAYED statements. If set to zero, which means INSERT DELAYED is not used.",

   (gptr*) &global_system_variables.max_insert_delayed_threads,
@@ -4828,11 +4853,6 @@ The minimum value for this variable is 4096.", 
   "After this many write locks, allow some read locks to run in between.",

   (gptr*) &max_write_lock_count, (gptr*) &max_write_lock_count, 0, GET_ULONG,

   REQUIRED_ARG, ~0L, 1, ~0L, 0, 1, 0},

  {"bulk_insert_buffer_size", OPT_BULK_INSERT_BUFFER_SIZE,

   "Size of tree cache used in bulk insert optimisation. Note that this is a limit per thread!",

   (gptr*) &global_system_variables.bulk_insert_buff_size,

   (gptr*) &max_system_variables.bulk_insert_buff_size,

   0, GET_ULONG, REQUIRED_ARG, 8192*1024, 0, ~0L, 0, 1, 0},

  {"myisam_block_size", OPT_MYISAM_BLOCK_SIZE,

   "Block size to be used for MyISAM index pages.",

   (gptr*) &opt_myisam_block_size,
@@ -4871,16 +4891,16 @@ The minimum value for this variable is 4096.", 
   (gptr*) &global_system_variables.net_buffer_length,

   (gptr*) &max_system_variables.net_buffer_length, 0, GET_ULONG,

   REQUIRED_ARG, 16384, 1024, 1024*1024L, 0, 1024, 0},

  {"net_retry_count", OPT_NET_RETRY_COUNT,

   "If a read on a communication port is interrupted, retry this many times before giving up.",

   (gptr*) &global_system_variables.net_retry_count,

   (gptr*) &max_system_variables.net_retry_count,0,

   GET_ULONG, REQUIRED_ARG, MYSQLD_NET_RETRY_COUNT, 1, ~0L, 0, 1, 0},

  {"net_read_timeout", OPT_NET_READ_TIMEOUT,

   "Number of seconds to wait for more data from a connection before aborting the read.",

   (gptr*) &global_system_variables.net_read_timeout,

   (gptr*) &max_system_variables.net_read_timeout, 0, GET_ULONG,

   REQUIRED_ARG, NET_READ_TIMEOUT, 1, LONG_TIMEOUT, 0, 1, 0},

  {"net_retry_count", OPT_NET_RETRY_COUNT,

   "If a read on a communication port is interrupted, retry this many times before giving up.",

   (gptr*) &global_system_variables.net_retry_count,

   (gptr*) &max_system_variables.net_retry_count,0,

   GET_ULONG, REQUIRED_ARG, MYSQLD_NET_RETRY_COUNT, 1, ~0L, 0, 1, 0},

  {"net_write_timeout", OPT_NET_WRITE_TIMEOUT,

   "Number of seconds to wait for a block to be written to a connection  before aborting the write.",

   (gptr*) &global_system_variables.net_write_timeout,
@@ -4932,11 +4952,21 @@ The minimum value for this variable is 4096.", 
   (gptr*) &global_system_variables.query_prealloc_size,

   (gptr*) &max_system_variables.query_prealloc_size, 0, GET_ULONG,

   REQUIRED_ARG, QUERY_ALLOC_PREALLOC_SIZE, 1024, ~0L, 0, 1024, 0},

  {"range_alloc_block_size", OPT_RANGE_ALLOC_BLOCK_SIZE,

   "Allocation block size for storing ranges during optimization",

   (gptr*) &global_system_variables.range_alloc_block_size,

   (gptr*) &max_system_variables.range_alloc_block_size, 0, GET_ULONG,

   REQUIRED_ARG, RANGE_ALLOC_BLOCK_SIZE, 1024, ~0L, 0, 1024, 0},

  {"read_buffer_size", OPT_RECORD_BUFFER,

   "Each thread that does a sequential scan allocates a buffer of this size for each table it scans. If you do many sequential scans, you may want to increase this value.",

   (gptr*) &global_system_variables.read_buff_size,

   (gptr*) &max_system_variables.read_buff_size,0, GET_ULONG, REQUIRED_ARG,

   128*1024L, IO_SIZE*2+MALLOC_OVERHEAD, ~0L, MALLOC_OVERHEAD, IO_SIZE, 0},

  {"read_only", OPT_READONLY,

   "Make all tables readonly, with the exception for replication (slave) threads and users with the SUPER privilege",

   (gptr*) &opt_readonly,

   (gptr*) &opt_readonly,

   0, GET_BOOL, NO_ARG, 0, 0, 1, 0, 1, 0},

  {"read_rnd_buffer_size", OPT_RECORD_RND_BUFFER,

   "When reading rows in sorted order after a sort, the rows are read through this buffer to avoid a disk seeks. If not set, then it's set to the value of record_buffer.",

   (gptr*) &global_system_variables.read_rnd_buff_size,
@@ -4969,16 +4999,6 @@ The minimum value for this variable is 4096.", 
   (gptr*) &slave_net_timeout, (gptr*) &slave_net_timeout, 0,

   GET_ULONG, REQUIRED_ARG, SLAVE_NET_TIMEOUT, 1, LONG_TIMEOUT, 0, 1, 0},

#endif /* HAVE_REPLICATION */

  {"range_alloc_block_size", OPT_RANGE_ALLOC_BLOCK_SIZE,

   "Allocation block size for storing ranges during optimization",

   (gptr*) &global_system_variables.range_alloc_block_size,

   (gptr*) &max_system_variables.range_alloc_block_size, 0, GET_ULONG,

   REQUIRED_ARG, RANGE_ALLOC_BLOCK_SIZE, 1024, ~0L, 0, 1024, 0},

  {"read-only", OPT_READONLY,

   "Make all tables readonly, with the exception for replication (slave) threads and users with the SUPER privilege",

   (gptr*) &opt_readonly,

   (gptr*) &opt_readonly,

   0, GET_BOOL, NO_ARG, 0, 0, 1, 0, 1, 0},

  {"slow_launch_time", OPT_SLOW_LAUNCH_TIME,

   "If creating the thread takes longer than this value (in seconds), the Slow_launch_threads counter will be incremented.",

   (gptr*) &slow_launch_time, (gptr*) &slow_launch_time, 0, GET_ULONG,
@@ -5008,23 +5028,28 @@ The minimum value for this variable is 4096.", 
   "The number of open tables for all threads.", (gptr*) &table_cache_size,

   (gptr*) &table_cache_size, 0, GET_ULONG, REQUIRED_ARG, 64, 1, 512*1024L,

   0, 1, 0},

  {"thread_concurrency", OPT_THREAD_CONCURRENCY,

   "Permits the application to give the threads system a hint for the desired number of threads that should be run at the same time.",

   (gptr*) &concurrency, (gptr*) &concurrency, 0, GET_ULONG, REQUIRED_ARG,

   DEFAULT_CONCURRENCY, 1, 512, 0, 1, 0},

  {"thread_cache_size", OPT_THREAD_CACHE_SIZE,

   "How many threads we should keep in a cache for reuse.",

   (gptr*) &thread_cache_size, (gptr*) &thread_cache_size, 0, GET_ULONG,

   REQUIRED_ARG, 0, 0, 16384, 0, 1, 0},

  {"thread_concurrency", OPT_THREAD_CONCURRENCY,

   "Permits the application to give the threads system a hint for the desired number of threads that should be run at the same time.",

   (gptr*) &concurrency, (gptr*) &concurrency, 0, GET_ULONG, REQUIRED_ARG,

   DEFAULT_CONCURRENCY, 1, 512, 0, 1, 0},

  {"thread_stack", OPT_THREAD_STACK,

   "The stack size for each thread.", (gptr*) &thread_stack,

   (gptr*) &thread_stack, 0, GET_ULONG, REQUIRED_ARG,DEFAULT_THREAD_STACK,

   1024L*128L, ~0L, 0, 1024, 0},

  { "time_format", OPT_TIME_FORMAT,

    "The TIME format (for future).",

    (gptr*) &opt_date_time_formats[MYSQL_TIMESTAMP_TIME],

    (gptr*) &opt_date_time_formats[MYSQL_TIMESTAMP_TIME],

    0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

  {"tmp_table_size", OPT_TMP_TABLE_SIZE,

   "If an in-memory temporary table exceeds this size, MySQL will automatically convert it to an on-disk MyISAM table.",

   (gptr*) &global_system_variables.tmp_table_size,

   (gptr*) &max_system_variables.tmp_table_size, 0, GET_ULONG,

   REQUIRED_ARG, 32*1024*1024L, 1024, ~0L, 0, 1, 0},

  {"thread_stack", OPT_THREAD_STACK,

   "The stack size for each thread.", (gptr*) &thread_stack,

   (gptr*) &thread_stack, 0, GET_ULONG, REQUIRED_ARG,DEFAULT_THREAD_STACK,

   1024L*128L, ~0L, 0, 1024, 0},

  {"transaction_alloc_block_size", OPT_TRANS_ALLOC_BLOCK_SIZE,

   "Allocation block size for transactions to be stored in binary log",

   (gptr*) &global_system_variables.trans_alloc_block_size,
@@ -5041,31 +5066,6 @@ The minimum value for this variable is 4096.", 
   (gptr*) &max_system_variables.net_wait_timeout, 0, GET_ULONG,

   REQUIRED_ARG, NET_WAIT_TIMEOUT, 1, IF_WIN(INT_MAX32/1000, LONG_TIMEOUT),

   0, 1, 0},

  {"expire_logs_days", OPT_EXPIRE_LOGS_DAYS,

   "Binary logs will be rotated after expire-log-days days ",

   (gptr*) &expire_logs_days,

   (gptr*) &expire_logs_days, 0, GET_ULONG,

   REQUIRED_ARG, 0, 0, 99, 0, 1, 0},

  { "default-week-format", OPT_DEFAULT_WEEK_FORMAT,

    "The default week format used by WEEK() functions.",

    (gptr*) &global_system_variables.default_week_format,

    (gptr*) &max_system_variables.default_week_format,

    0, GET_ULONG, REQUIRED_ARG, 0, 0, 7L, 0, 1, 0},

  { "date-format", OPT_DATE_FORMAT,

    "The DATE format (For future).",

    (gptr*) &opt_date_time_formats[MYSQL_TIMESTAMP_DATE],

    (gptr*) &opt_date_time_formats[MYSQL_TIMESTAMP_DATE],

    0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

  { "datetime-format", OPT_DATETIME_FORMAT,

    "The DATETIME/TIMESTAMP format (for future).",

    (gptr*) &opt_date_time_formats[MYSQL_TIMESTAMP_DATETIME],

    (gptr*) &opt_date_time_formats[MYSQL_TIMESTAMP_DATETIME],

    0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

  { "time-format", OPT_TIME_FORMAT,

    "The TIME format (for future).",

    (gptr*) &opt_date_time_formats[MYSQL_TIMESTAMP_TIME],

    (gptr*) &opt_date_time_formats[MYSQL_TIMESTAMP_TIME],

    0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

  {0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}

};