summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
diff options
context:
space:
mode:
Diffstat (limited to 'sql/mysqld.cc')
-rw-r--r--sql/mysqld.cc29
1 files changed, 29 insertions, 0 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 1c26d4a8b7c..0664175d2a2 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -3567,6 +3567,10 @@ enum options
OPT_BDB_LOG_BUFFER_SIZE,
OPT_BDB_MAX_LOCK,
OPT_ERROR_LOG_FILE,
+ OPT_DEFAULT_WEEK_FORMAT,
+ OPT_RANGE_ALLOC_BLOCK_SIZE,
+ OPT_QUERY_ALLOC_BLOCK_SIZE, OPT_QUERY_PREALLOC_SIZE,
+ OPT_TRANS_ALLOC_BLOCK_SIZE, OPT_TRANS_PREALLOC_SIZE,
OPT_ENABLE_SHARED_MEMORY,
OPT_SHARED_MEMORY_BASE_NAME,
OPT_OLD_PASSWORDS,
@@ -4392,6 +4396,11 @@ The minimum value for this variable is 4096.",
(gptr*) &global_system_variables.preload_buff_size,
(gptr*) &max_system_variables.preload_buff_size, 0, GET_ULONG,
REQUIRED_ARG, 32*1024L, 1024, 1024*1024*1024L, 0, 1, 0},
+ {"query_alloc_block_size", OPT_QUERY_ALLOC_BLOCK_SIZE,
+ "Allocation block size for query parsing and execution",
+ (gptr*) &global_system_variables.query_alloc_block_size,
+ (gptr*) &max_system_variables.query_alloc_block_size, 0, GET_ULONG,
+ REQUIRED_ARG, QUERY_ALLOC_BLOCK_SIZE, 1024, ~0L, 0, 1024, 0},
#ifdef HAVE_QUERY_CACHE
{"query_cache_limit", OPT_QUERY_CACHE_LIMIT,
"Don't cache results that are bigger than this.",
@@ -4413,6 +4422,11 @@ The minimum value for this variable is 4096.",
(gptr*) &global_system_variables.query_cache_type,
(gptr*) &max_system_variables.query_cache_type,
0, GET_ULONG, REQUIRED_ARG, 1, 0, 2, 0, 1, 0},
+ {"query_prealloc_size", OPT_QUERY_PREALLOC_SIZE,
+ "Persistent buffer for query parsing and execution",
+ (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},
#endif /*HAVE_QUERY_CACHE*/
{"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.",
@@ -4451,6 +4465,11 @@ 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 expections for replications (slave) threads and users with the SUPER privilege.",
(gptr*) &opt_readonly,
@@ -4487,6 +4506,16 @@ The minimum value for this variable is 4096.",
"The stack size for each thread.", (gptr*) &thread_stack,
(gptr*) &thread_stack, 0, GET_ULONG, REQUIRED_ARG,DEFAULT_THREAD_STACK,
1024*32, ~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,
+ (gptr*) &max_system_variables.trans_alloc_block_size, 0, GET_ULONG,
+ REQUIRED_ARG, QUERY_ALLOC_BLOCK_SIZE, 1024, ~0L, 0, 1024, 0},
+ {"transaction_prealloc_size", OPT_TRANS_PREALLOC_SIZE,
+ "Persistent buffer for transactions to be stored in binary log",
+ (gptr*) &global_system_variables.trans_prealloc_size,
+ (gptr*) &max_system_variables.trans_prealloc_size, 0, GET_ULONG,
+ REQUIRED_ARG, TRANS_ALLOC_PREALLOC_SIZE, 1024, ~0L, 0, 1024, 0},
{"wait_timeout", OPT_WAIT_TIMEOUT,
"The number of seconds the server waits for activity on a connection before closing it.",
(gptr*) &global_system_variables.net_wait_timeout,