mysqld.cc:

Post merge changes.
This commit is contained in:
evgen@moonbone.local 2007-08-02 23:08:52 +04:00
parent 2943ddc61e
commit e9eb6309fb

View file

@ -5071,8 +5071,7 @@ enum options_mysqld
OPT_PLUGIN_DIR,
OPT_LOG_OUTPUT,
OPT_PORT_OPEN_TIMEOUT,
OPT_SECURE_FILE_PRIV,
OPT_KEEP_FILES_ON_CREATE
OPT_KEEP_FILES_ON_CREATE,
OPT_GENERAL_LOG,
OPT_SLOW_LOG,
OPT_THREAD_HANDLING,
@ -5945,8 +5944,8 @@ log and this option does nothing anymore.",
IO_SIZE, 0},
{"keep_files_on_create", OPT_KEEP_FILES_ON_CREATE,
"Don't overwrite stale .MYD and .MYI even if no directory is specified.",
(gptr*) &global_system_variables.keep_files_on_create,
(gptr*) &max_system_variables.keep_files_on_create,
(uchar**) &global_system_variables.keep_files_on_create,
(uchar**) &max_system_variables.keep_files_on_create,
0, GET_BOOL, OPT_ARG, 0, 0, 0, 0, 0, 0},
{"key_buffer_size", OPT_KEY_BUFFER_SIZE,
"The size of the buffer used for index blocks for MyISAM tables. Increase this to get better index handling (for all reads and multiple writes) to as much as you can afford; 64M on a 256M machine that mainly runs MySQL is quite common.",