after-merge fixes

This commit is contained in:
Sergei Golubchik 2014-10-15 22:42:08 +02:00
commit 42f359f982
14 changed files with 282 additions and 307 deletions

View file

@ -1449,6 +1449,20 @@ NUMERIC_BLOCK_SIZE NULL
ENUM_VALUE_LIST NULL
READ_ONLY NO
COMMAND_LINE_ARGUMENT REQUIRED
VARIABLE_NAME KEY_CACHE_FILE_HASH_SIZE
SESSION_VALUE NULL
GLOBAL_VALUE 512
GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 512
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE BIGINT UNSIGNED
VARIABLE_COMMENT Number of hash buckets for open and changed files. If you have a lot of MyISAM files open you should increase this for faster flush of changes. A good value is probably 1/10 of number of possible open MyISAM files.
NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL
NUMERIC_BLOCK_SIZE NULL
ENUM_VALUE_LIST NULL
READ_ONLY NO
COMMAND_LINE_ARGUMENT REQUIRED
VARIABLE_NAME KEY_CACHE_SEGMENTS
SESSION_VALUE NULL
GLOBAL_VALUE 0
@ -4466,7 +4480,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE OFF
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE BOOLEAN
VARIABLE_COMMENT Specify whether to time mutexes (only InnoDB mutexes are currently supported)
VARIABLE_COMMENT Specify whether to time mutexes. Deprecated, has no effect.
NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL
NUMERIC_BLOCK_SIZE NULL