From 1f7a8a205050a8793b739e9a44b136b2e9ce636b Mon Sep 17 00:00:00 2001
From: unknown <jcole@tetra.spaceapes.com>
Date: Fri, 1 Sep 2000 18:10:56 -0500
Subject: [PATCH] Cleaned up structs/enums in mysqld.cc
sql/mysqld.cc:
Cleaned up structs/enums
---
sql/mysqld.cc | 546 ++++++++++++++++++++++++++------------------------
1 file changed, 287 insertions(+), 259 deletions(-)
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 8ea12f68da..05fe2d9298 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -32,7 +32,7 @@ extern "C" { // Because of SCO 3.2V4.2
#include <errno.h>
#include <sys/stat.h>
#ifndef __GNU_LIBRARY__
-#define __GNU_LIBRARY__ // Skipp warnings in getopt.h
+#define __GNU_LIBRARY__ // Skip warnings in getopt.h
#endif
#include <getopt.h>
#ifdef HAVE_SYSENT_H
@@ -2141,291 +2141,317 @@ pthread_handler_decl(handle_flush,arg __attribute__((unused)))
** handle start options
******************************************************************************/
-enum options {OPT_ISAM_LOG=256,OPT_SKIP_NEW,OPT_SKIP_GRANT,
- OPT_SKIP_LOCK,OPT_ENABLE_LOCK,
- OPT_USE_LOCKING,OPT_SOCKET,OPT_UPDATE_LOG, OPT_BIN_LOG,
- OPT_SKIP_RESOLVE,OPT_SKIP_NETWORKING, OPT_BIN_LOG_INDEX,
- OPT_BIND_ADDRESS,OPT_PID_FILE,OPT_SKIP_PRIOR,OPT_BIG_TABLES,
- OPT_STANDALONE,OPT_ONE_THREAD,OPT_CONSOLE,
- OPT_LOW_PRIORITY_UPDATES,OPT_SKIP_HOST_CACHE,OPT_LONG_FORMAT,
- OPT_FLUSH, OPT_SAFE, OPT_BOOTSTRAP, OPT_SKIP_SHOW_DB,
- OPT_TABLE_TYPE, OPT_INIT_FILE, OPT_DELAY_KEY_WRITE,
- OPT_SLOW_QUERY_LOG, OPT_SKIP_DELAY_KEY_WRITE,
- OPT_CHARSETS_DIR,
- OPT_BDB_HOME, OPT_BDB_LOG, OPT_BDB_TMP, OPT_BDB_NOSYNC,
- OPT_BDB_LOCK, OPT_BDB_SKIP, OPT_BDB_RECOVER,
- OPT_MASTER_HOST, OPT_MASTER_USER, OPT_MASTER_PASSWORD,
- OPT_MASTER_PORT, OPT_MASTER_INFO_FILE, OPT_MASTER_CONNECT_RETRY,
- OPT_SQL_BIN_UPDATE_SAME, OPT_REPLICATE_DO_DB,
- OPT_REPLICATE_IGNORE_DB, OPT_LOG_SLAVE_UPDATES,
- OPT_BINLOG_DO_DB, OPT_BINLOG_IGNORE_DB, OPT_WANT_CORE};
-
-static struct option long_options[] =
-{
- {"ansi", no_argument,0, 'a'},
- {"basedir", required_argument, 0, 'b'},
+enum options {
+ OPT_ISAM_LOG=256, OPT_SKIP_NEW,
+ OPT_SKIP_GRANT, OPT_SKIP_LOCK,
+ OPT_ENABLE_LOCK, OPT_USE_LOCKING,
+ OPT_SOCKET, OPT_UPDATE_LOG,
+ OPT_BIN_LOG, OPT_SKIP_RESOLVE,
+ OPT_SKIP_NETWORKING, OPT_BIN_LOG_INDEX,
+ OPT_BIND_ADDRESS, OPT_PID_FILE,
+ OPT_SKIP_PRIOR, OPT_BIG_TABLES,
+ OPT_STANDALONE, OPT_ONE_THREAD,
+ OPT_CONSOLE, OPT_LOW_PRIORITY_UPDATES,
+ OPT_SKIP_HOST_CACHE, OPT_LONG_FORMAT,
+ OPT_FLUSH, OPT_SAFE,
+ OPT_BOOTSTRAP, OPT_SKIP_SHOW_DB,
+ OPT_TABLE_TYPE, OPT_INIT_FILE,
+ OPT_DELAY_KEY_WRITE, OPT_SLOW_QUERY_LOG,
+ OPT_SKIP_DELAY_KEY_WRITE, OPT_CHARSETS_DIR,
+ OPT_BDB_HOME, OPT_BDB_LOG,
+ OPT_BDB_TMP, OPT_BDB_NOSYNC,
+ OPT_BDB_LOCK, OPT_BDB_SKIP,
+ OPT_BDB_RECOVER, OPT_MASTER_HOST,
+ OPT_MASTER_USER, OPT_MASTER_PASSWORD,
+ OPT_MASTER_PORT, OPT_MASTER_INFO_FILE,
+ OPT_MASTER_CONNECT_RETRY, OPT_SQL_BIN_UPDATE_SAME,
+ OPT_REPLICATE_DO_DB, OPT_REPLICATE_IGNORE_DB,
+ OPT_LOG_SLAVE_UPDATES, OPT_BINLOG_DO_DB,
+ OPT_BINLOG_IGNORE_DB, OPT_WANT_CORE
+};
+
+static struct option long_options[] = {
+ {"ansi", no_argument, 0, 'a'},
+ {"basedir", required_argument, 0, 'b'},
#ifdef HAVE_BERKELEY_DB
- {"bdb-home", required_argument, 0, OPT_BDB_HOME},
- {"bdb-lock-detect", required_argument, 0, OPT_BDB_LOCK},
- {"bdb-logdir", required_argument, 0, OPT_BDB_LOG},
- {"bdb-recover", no_argument, 0, OPT_BDB_RECOVER},
- {"bdb-no-sync", no_argument, 0, OPT_BDB_NOSYNC},
- {"bdb-tmpdir", required_argument, 0, OPT_BDB_TMP},
-#endif
- {"big-tables", no_argument,0,(int) OPT_BIG_TABLES},
- {"binlog-do-db", required_argument, 0, OPT_BINLOG_DO_DB},
- {"binlog-ignore-db", required_argument, 0, OPT_BINLOG_IGNORE_DB},
- {"bind-address", required_argument, 0, OPT_BIND_ADDRESS},
- {"bootstrap", no_argument,0,(int) OPT_BOOTSTRAP},
+ {"bdb-home", required_argument, 0, (int) OPT_BDB_HOME},
+ {"bdb-lock-detect", required_argument, 0, (int) OPT_BDB_LOCK},
+ {"bdb-logdir", required_argument, 0, (int) OPT_BDB_LOG},
+ {"bdb-recover", no_argument, 0, (int) OPT_BDB_RECOVER},
+ {"bdb-no-sync", no_argument, 0, (int) OPT_BDB_NOSYNC},
+ {"bdb-tmpdir", required_argument, 0, (int) OPT_BDB_TMP},
+#endif
+ {"big-tables", no_argument, 0, (int) OPT_BIG_TABLES},
+ {"binlog-do-db", required_argument, 0, (int) OPT_BINLOG_DO_DB},
+ {"binlog-ignore-db", required_argument, 0, (int) OPT_BINLOG_IGNORE_DB},
+ {"bind-address", required_argument, 0, (int) OPT_BIND_ADDRESS},
+ {"bootstrap", no_argument, 0, (int) OPT_BOOTSTRAP},
#ifdef __WIN__
- {"console", no_argument, 0, OPT_CONSOLE},
+ {"console", no_argument, 0, (int) OPT_CONSOLE},
#endif
- {"core-file", no_argument, 0, OPT_WANT_CORE},
- {"chroot", required_argument,0, 'r'},
- {"character-sets-dir",required_argument,0, OPT_CHARSETS_DIR},
- {"datadir", required_argument, 0, 'h'},
+ {"core-file", no_argument, 0, (int) OPT_WANT_CORE},
+ {"chroot", required_argument, 0, 'r'},
+ {"character-sets-dir", required_argument, 0, (int) OPT_CHARSETS_DIR},
+ {"datadir", required_argument, 0, 'h'},
#ifndef DBUG_OFF
- {"debug", optional_argument, 0, '#'},
+ {"debug", optional_argument, 0, '#'},
#endif
- {"default-character-set",required_argument,0,'C'},
- {"default-table-type",required_argument,0,OPT_TABLE_TYPE},
+ {"default-character-set", required_argument, 0, 'C'},
+ {"default-table-type", required_argument, 0, (int) OPT_TABLE_TYPE},
{"delay-key-write-for-all-tables",
- no_argument, 0, (int) OPT_DELAY_KEY_WRITE},
- {"enable-locking", no_argument, 0, (int) OPT_ENABLE_LOCK},
- {"exit-info", optional_argument, 0, 'T'},
- {"flush", no_argument, 0, OPT_FLUSH},
- {"help", no_argument, 0, '?'},
- {"init-file", required_argument, 0, (int) OPT_INIT_FILE},
- {"log", optional_argument, 0, 'l'},
- {"language", required_argument, 0, 'L'},
- {"log-bin", optional_argument, 0, (int) OPT_BIN_LOG},
- {"log-bin-index", optional_argument, 0, (int) OPT_BIN_LOG_INDEX},
- {"log-isam", optional_argument, 0, (int) OPT_ISAM_LOG},
- {"log-update", optional_argument, 0, (int) OPT_UPDATE_LOG},
- {"log-slow-queries", optional_argument, 0, (int) OPT_SLOW_QUERY_LOG},
- {"log-long-format", no_argument, 0, (int) OPT_LONG_FORMAT},
- {"log-slave-updates", no_argument,0, (int) OPT_LOG_SLAVE_UPDATES},
- {"low-priority-updates", no_argument, 0, (int) OPT_LOW_PRIORITY_UPDATES},
- {"master-host", required_argument, 0, (int) OPT_MASTER_HOST},
- {"master-user", required_argument, 0, (int) OPT_MASTER_USER},
- {"master-password", required_argument, 0, (int) OPT_MASTER_PASSWORD},
- {"master-port", required_argument, 0, (int) OPT_MASTER_PORT},
- {"master-connect-retry", required_argument, 0, (int) OPT_MASTER_CONNECT_RETRY},
- {"master-info-file", required_argument, 0, (int) OPT_MASTER_INFO_FILE},
- {"new", no_argument, 0, 'n'},
- {"old-protocol", no_argument, 0, 'o'},
+ no_argument, 0, (int) OPT_DELAY_KEY_WRITE},
+ {"enable-locking", no_argument, 0, (int) OPT_ENABLE_LOCK},
+ {"exit-info", optional_argument, 0, 'T'},
+ {"flush", no_argument, 0, (int) OPT_FLUSH},
+ {"help", no_argument, 0, '?'},
+ {"init-file", required_argument, 0, (int) OPT_INIT_FILE},
+ {"log", optional_argument, 0, 'l'},
+ {"language", required_argument, 0, 'L'},
+ {"log-bin", optional_argument, 0, (int) OPT_BIN_LOG},
+ {"log-bin-index", optional_argument, 0, (int) OPT_BIN_LOG_INDEX},
+ {"log-isam", optional_argument, 0, (int) OPT_ISAM_LOG},
+ {"log-update", optional_argument, 0, (int) OPT_UPDATE_LOG},
+ {"log-slow-queries", optional_argument, 0, (int) OPT_SLOW_QUERY_LOG},
+ {"log-long-format", no_argument, 0, (int) OPT_LONG_FORMAT},
+ {"log-slave-updates", no_argument, 0, (int) OPT_LOG_SLAVE_UPDATES},
+ {"low-priority-updates", no_argument, 0, (int) OPT_LOW_PRIORITY_UPDATES},
+ {"master-host", required_argument, 0, (int) OPT_MASTER_HOST},
+ {"master-user", required_argument, 0, (int) OPT_MASTER_USER},
+ {"master-password", required_argument, 0, (int) OPT_MASTER_PASSWORD},
+ {"master-port", required_argument, 0, (int) OPT_MASTER_PORT},
+ {"master-connect-retry", required_argument, 0, (int) OPT_MASTER_CONNECT_RETRY},
+ {"master-info-file", required_argument, 0, (int) OPT_MASTER_INFO_FILE},
+ {"new", no_argument, 0, 'n'},
+ {"old-protocol", no_argument, 0, 'o'},
#ifndef DBUG_OFF
- {"one-thread", no_argument, 0, OPT_ONE_THREAD},
-#endif
- {"pid-file", required_argument, 0, (int) OPT_PID_FILE},
- {"port", required_argument, 0, 'P'},
- {"replicate-do-db", required_argument, 0, OPT_REPLICATE_DO_DB},
- {"replicate-ignore-db", required_argument, 0, OPT_REPLICATE_IGNORE_DB},
- {"safe-mode", no_argument, 0, (int) OPT_SAFE},
- {"socket", required_argument, 0, (int) OPT_SOCKET},
- {"set-variable", required_argument, 0, 'O'},
+ {"one-thread", no_argument, 0, (int) OPT_ONE_THREAD},
+#endif
+ {"pid-file", required_argument, 0, (int) OPT_PID_FILE},
+ {"port", required_argument, 0, 'P'},
+ {"replicate-do-db", required_argument, 0, (int) OPT_REPLICATE_DO_DB},
+ {"replicate-ignore-db", required_argument, 0, (int) OPT_REPLICATE_IGNORE_DB},
+ {"safe-mode", no_argument, 0, (int) OPT_SAFE},
+ {"socket", required_argument, 0, (int) OPT_SOCKET},
+ {"set-variable", required_argument, 0, 'O'},
#ifdef HAVE_BERKELEY_DB
- {"skip-bdb", no_argument, 0, OPT_BDB_SKIP},
-#endif
- {"skip-delay-key-write", no_argument, 0, (int) OPT_SKIP_DELAY_KEY_WRITE},
- {"skip-grant-tables", no_argument,0, (int) OPT_SKIP_GRANT},
- {"skip-locking", no_argument,0, (int) OPT_SKIP_LOCK},
- {"skip-host-cache", no_argument,0, (int) OPT_SKIP_HOST_CACHE},
- {"skip-name-resolve", no_argument,0, (int) OPT_SKIP_RESOLVE},
- {"skip-new", no_argument,0, (int) OPT_SKIP_NEW},
- {"skip-show-database",no_argument,0, (int) OPT_SKIP_SHOW_DB},
- {"skip-networking", no_argument,0, (int) OPT_SKIP_NETWORKING},
- {"skip-thread-priority", no_argument,0,(int) OPT_SKIP_PRIOR},
- {"sql-bin-update-same", no_argument, 0, (int)OPT_SQL_BIN_UPDATE_SAME},
+ {"skip-bdb", no_argument, 0, (int) OPT_BDB_SKIP},
+#endif
+ {"skip-delay-key-write", no_argument, 0, (int) OPT_SKIP_DELAY_KEY_WRITE},
+ {"skip-grant-tables", no_argument, 0, (int) OPT_SKIP_GRANT},
+ {"skip-locking", no_argument, 0, (int) OPT_SKIP_LOCK},
+ {"skip-host-cache", no_argument, 0, (int) OPT_SKIP_HOST_CACHE},
+ {"skip-name-resolve", no_argument, 0, (int) OPT_SKIP_RESOLVE},
+ {"skip-new", no_argument, 0, (int) OPT_SKIP_NEW},
+ {"skip-show-database", no_argument, 0, (int) OPT_SKIP_SHOW_DB},
+ {"skip-networking", no_argument, 0, (int) OPT_SKIP_NETWORKING},
+ {"skip-thread-priority", no_argument, 0, (int) OPT_SKIP_PRIOR},
+ {"sql-bin-update-same", no_argument, 0, (int) OPT_SQL_BIN_UPDATE_SAME},
#include "sslopt-longopts.h"
#ifdef __WIN__
- {"standalone", no_argument,0, (int) OPT_STANDALONE},
+ {"standalone", no_argument, 0, (int) OPT_STANDALONE},
#endif
- {"tmpdir", required_argument, 0, 't'},
- {"use-locking", no_argument, 0,(int) OPT_USE_LOCKING},
+ {"tmpdir", required_argument, 0, 't'},
+ {"use-locking", no_argument, 0, (int) OPT_USE_LOCKING},
#ifdef USE_SYMDIR
- {"use-symbolic-links",no_argument, 0, 's'},
+ {"use-symbolic-links", no_argument, 0, 's'},
#endif
- {"user", required_argument, 0, 'u'},
- {"version", no_argument, 0, 'V'},
+ {"user", required_argument, 0, 'u'},
+ {"version", no_argument, 0, 'V'},
{0, 0, 0, 0}
};
CHANGEABLE_VAR changeable_vars[] = {
- { "back_log", (long*) &back_log,50,1,65535,0,1},
+ { "back_log", (long*) &back_log,
+ 50, 1, 65535, 0, 1 },
#ifdef HAVE_BERKELEY_DB
- { "bdb_cache_size", (long*) &berkeley_cache_size, KEY_CACHE_SIZE,
- 20*1024, (long) ~0, 0, IO_SIZE},
-#endif
- { "connect_timeout", (long*) &connect_timeout,CONNECT_TIMEOUT,2,65535,0,1},
- { "delayed_insert_timeout",(long*) &delayed_insert_timeout,
- DELAYED_WAIT_TIMEOUT,1,~0L,0,1},
- { "delayed_insert_limit",(long*) &delayed_insert_limit,
- DELAYED_LIMIT,1,~0L,0,1},
- { "delayed_queue_size", (long*) &delayed_queue_size,DELAYED_QUEUE_SIZE,1,
- ~0L,0,1},
- { "flush_time", (long*) &flush_time,FLUSH_TIME,0,~0L,0,1},
- { "interactive_timeout", (long*) &net_interactive_timeout,
- NET_WAIT_TIMEOUT,1,31*24*60*60,0,1},
- { "join_buffer_size", (long*) &join_buff_size,128*1024L,
- IO_SIZE*2+MALLOC_OVERHEAD,~0L,MALLOC_OVERHEAD,IO_SIZE },
- { "key_buffer_size", (long*) &keybuff_size,KEY_CACHE_SIZE,MALLOC_OVERHEAD,
- (long) ~0, MALLOC_OVERHEAD, IO_SIZE },
- { "long_query_time", (long*) &long_query_time,10,1,~0L,0,1},
- { "lower_case_table_names", (long*) &lower_case_table_names,IF_WIN(1,0),
- 0,1,0,1},
- { "max_allowed_packet",(long*) &max_allowed_packet,1024*1024L,80,
- 17*1024*1024L, MALLOC_OVERHEAD,1024},
- { "max_connections", (long*) &max_connections,100,1,16384,0,1},
- { "max_connect_errors", (long*) &max_connect_errors,MAX_CONNECT_ERRORS,1,
- ~0L,0,1},
- { "max_delayed_threads", (long*) &max_insert_delayed_threads,20,1,
- 16384,0,1},
- { "max_heap_table_size",(long*) &max_heap_table_size,16*1024*1024L,16384,~0L,
- MALLOC_OVERHEAD,1024},
- { "max_join_size",(long*) &max_join_size,~0L,1,~0L,0,1},
- { "max_sort_length",(long*) &max_item_sort_length,1024,4,8192*1024L,0,1},
- { "max_tmp_tables",(long*) &max_tmp_tables,32,1,~0L,0,1},
- { "max_write_lock_count",(long*) &max_write_lock_count,~0L,1,~0L,0,1},
- { "myisam_sort_buffer_size", (long*) &myisam_sort_buffer_size,8192*1024,4,
- ~0L,0,1},
- { "net_buffer_length",(long*) &net_buffer_length,16384,1024,1024*1024L,
- MALLOC_OVERHEAD,1024},
- { "net_retry_count",(long*) &mysqld_net_retry_count,MYSQLD_NET_RETRY_COUNT,
- 1,~0L, 0,1},
- { "net_read_timeout", (long*) &net_read_timeout, NET_READ_TIMEOUT,1,65535,0,1},
- { "net_write_timeout", (long*) &net_write_timeout,NET_WRITE_TIMEOUT,1,65535,0,1},
- { "query_buffer_size", (long*) &query_buff_size,0,MALLOC_OVERHEAD,
- (long) ~0, MALLOC_OVERHEAD, IO_SIZE },
- { "record_buffer", (long*) &my_default_record_cache_size,128*1024L,
- IO_SIZE*2+MALLOC_OVERHEAD,~0L,MALLOC_OVERHEAD,IO_SIZE },
- { "slow_launch_time", (long*) &slow_launch_time, 2L,
- 0L,~0L,0,1 },
- { "sort_buffer", (long*) &sortbuff_size,MAX_SORT_MEMORY,
- MIN_SORT_MEMORY+MALLOC_OVERHEAD*2,~0L,MALLOC_OVERHEAD,1 },
- { "table_cache", (long*) &table_cache_size,64,1,16384,0,1},
- { "thread_concurrency", (long*) &concurrency,DEFAULT_CONCURRENCY,1,512,0,1},
- { "thread_cache_size", (long*) &thread_cache_size, 0,1,16384,0,1},
- { "tmp_table_size", (long*) &tmp_table_size,1024*1024L,1024,~0L,
- MALLOC_OVERHEAD,1},
- { "thread_stack", (long*) &thread_stack,1024*64,1024*32,~0L,0,1024},
- { "wait_timeout", (long*) &net_wait_timeout,NET_WAIT_TIMEOUT,1,~0L,0,1},
- { NullS,(long*) 0,0,0,0,0,0,} };
+ { "bdb_cache_size", (long*) &berkeley_cache_size,
+ KEY_CACHE_SIZE, 20*1024, (long) ~0, 0, IO_SIZE },
+#endif
+ { "connect_timeout", (long*) &connect_timeout,
+ CONNECT_TIMEOUT, 2, 65535, 0, 1 },
+ { "delayed_insert_timeout", (long*) &delayed_insert_timeout,
+ DELAYED_WAIT_TIMEOUT, 1, ~0L, 0, 1 },
+ { "delayed_insert_limit", (long*) &delayed_insert_limit,
+ DELAYED_LIMIT, 1, ~0L, 0, 1 },
+ { "delayed_queue_size", (long*) &delayed_queue_size,
+ DELAYED_QUEUE_SIZE, 1, ~0L, 0, 1 },
+ { "flush_time", (long*) &flush_time,
+ FLUSH_TIME, 0, ~0L, 0, 1 },
+ { "interactive_timeout", (long*) &net_interactive_timeout,
+ NET_WAIT_TIMEOUT, 1, 31*24*60*60, 0, 1 },
+ { "join_buffer_size", (long*) &join_buff_size,
+ 128*1024L, IO_SIZE*2+MALLOC_OVERHEAD, ~0L, MALLOC_OVERHEAD, IO_SIZE },
+ { "key_buffer_size", (long*) &keybuff_size,
+ KEY_CACHE_SIZE, MALLOC_OVERHEAD, (long) ~0, MALLOC_OVERHEAD, IO_SIZE },
+ { "long_query_time", (long*) &long_query_time,
+ 10, 1, ~0L, 0, 1 },
+ { "lower_case_table_names", (long*) &lower_case_table_names,
+ IF_WIN(1,0), 0, 1, 0, 1 },
+ { "max_allowed_packet", (long*) &max_allowed_packet,
+ 1024*1024L, 80, 17*1024*1024L, MALLOC_OVERHEAD, 1024 },
+ { "max_connections", (long*) &max_connections,
+ 100, 1, 16384, 0, 1 },
+ { "max_connect_errors", (long*) &max_connect_errors,
+ MAX_CONNECT_ERRORS, 1, ~0L, 0, 1 },
+ { "max_delayed_threads", (long*) &max_insert_delayed_threads,
+ 20, 1, 16384, 0, 1 },
+ { "max_heap_table_size", (long*) &max_heap_table_size,
+ 16*1024*1024L, 16384, ~0L, MALLOC_OVERHEAD, 1024 },
+ { "max_join_size", (long*) &max_join_size,
+ ~0L, 1, ~0L, 0, 1 },
+ { "max_sort_length", (long*) &max_item_sort_length,
+ 1024, 4, 8192*1024L, 0, 1 },
+ { "max_tmp_tables", (long*) &max_tmp_tables,
+ 32, 1, ~0L, 0, 1 },
+ { "max_write_lock_count", (long*) &max_write_lock_count,
+ ~0L, 1, ~0L, 0, 1 },
+ { "myisam_sort_buffer_size", (long*) &myisam_sort_buffer_size,
+ 8192*1024, 4, ~0L, 0, 1 },
+ { "net_buffer_length", (long*) &net_buffer_length,
+ 16384, 1024, 1024*1024L, MALLOC_OVERHEAD, 1024 },
+ { "net_retry_count", (long*) &mysqld_net_retry_count,
+ MYSQLD_NET_RETRY_COUNT, 1, ~0L, 0, 1 },
+ { "net_read_timeout", (long*) &net_read_timeout,
+ NET_READ_TIMEOUT, 1, 65535, 0, 1 },
+ { "net_write_timeout", (long*) &net_write_timeout,
+ NET_WRITE_TIMEOUT, 1, 65535, 0, 1 },
+ { "query_buffer_size", (long*) &query_buff_size,
+ 0, MALLOC_OVERHEAD, (long) ~0, MALLOC_OVERHEAD, IO_SIZE },
+ { "record_buffer", (long*) &my_default_record_cache_size,
+ 128*1024L, IO_SIZE*2+MALLOC_OVERHEAD, ~0L, MALLOC_OVERHEAD, IO_SIZE },
+ { "slow_launch_time", (long*) &slow_launch_time,
+ 2L, 0L, ~0L, 0, 1 },
+ { "sort_buffer", (long*) &sortbuff_size,
+ MAX_SORT_MEMORY, MIN_SORT_MEMORY+MALLOC_OVERHEAD*2, ~0L, MALLOC_OVERHEAD, 1 },
+ { "table_cache", (long*) &table_cache_size,
+ 64, 1, 16384, 0, 1 },
+ { "thread_concurrency", (long*) &concurrency,
+ DEFAULT_CONCURRENCY, 1, 512, 0, 1 },
+ { "thread_cache_size", (long*) &thread_cache_size,
+ 0, 1, 16384, 0, 1 },
+ { "tmp_table_size", (long*) &tmp_table_size,
+ 1024*1024L, 1024, ~0L, MALLOC_OVERHEAD, 1 },
+ { "thread_stack", (long*) &thread_stack,
+ 1024*64, 1024*32, ~0L, 0, 1024 },
+ { "wait_timeout", (long*) &net_wait_timeout,
+ NET_WAIT_TIMEOUT, 1, ~0L, 0, 1 },
+ { NullS, (long*) 0, 0, 0, 0, 0, 0}
+};
struct show_var_st init_vars[]= {
- {"ansi_mode",(char*) &opt_ansi_mode ,SHOW_BOOL},
- {"back_log", (char*) &back_log, SHOW_LONG},
- {"basedir", mysql_home,SHOW_CHAR},
+ {"ansi_mode", (char*) &opt_ansi_mode, SHOW_BOOL},
+ {"back_log", (char*) &back_log, SHOW_LONG},
+ {"basedir", mysql_home, SHOW_CHAR},
#ifdef HAVE_BERKELEY_DB
- {"bdb_cache_size", (char*) &berkeley_cache_size, SHOW_LONG},
- {"bdb_home", (char*) &berkeley_home, SHOW_CHAR_PTR},
- {"bdb_logdir", (char*) &berkeley_logdir, SHOW_CHAR_PTR},
- {"bdb_tmpdir", (char*) &berkeley_tmpdir, SHOW_CHAR_PTR},
-#endif
- {"character_set", default_charset, SHOW_CHAR},
- {"character_sets", (char*) &charsets_list, SHOW_CHAR_PTR},
- {"connect_timeout", (char*) &connect_timeout, SHOW_LONG},
- {"concurrent_insert",(char*) &myisam_concurrent_insert, SHOW_MY_BOOL},
- {"datadir", mysql_real_data_home,SHOW_CHAR},
- {"delay_key_write",(char*) &myisam_delay_key_write, SHOW_MY_BOOL},
- {"delayed_insert_limit",(char*) &delayed_insert_limit,SHOW_LONG},
- {"delayed_insert_timeout",(char*) &delayed_insert_timeout,SHOW_LONG},
- {"delayed_queue_size", (char*) &delayed_queue_size,SHOW_LONG},
- {"join_buffer_size", (char*) &join_buff_size, SHOW_LONG},
- {"flush", (char*) &myisam_flush, SHOW_MY_BOOL},
- {"flush_time",(char*) &flush_time, SHOW_LONG},
- {"init_file", (char*) &opt_init_file, SHOW_CHAR_PTR},
- {"interactive_timeout", (char*) &net_interactive_timeout, SHOW_LONG},
- {"key_buffer_size", (char*) &keybuff_size, SHOW_LONG},
- {"language", language, SHOW_CHAR},
- {"log", (char*) &opt_log, SHOW_BOOL},
- {"log_update",(char*) &opt_update_log,SHOW_BOOL},
- {"log_bin",(char*) &opt_bin_log,SHOW_BOOL},
- {"log_slave_updates",(char*) &opt_log_slave_updates,SHOW_BOOL},
- {"long_query_time", (char*) &long_query_time, SHOW_LONG},
- {"low_priority_updates", (char*) &low_priority_updates, SHOW_BOOL},
- {"lower_case_table_names", (char*) &lower_case_table_names, SHOW_LONG},
- {"max_allowed_packet", (char*) &max_allowed_packet, SHOW_LONG},
- {"max_connections", (char*) &max_connections, SHOW_LONG},
- {"max_connect_errors", (char*) &max_connect_errors, SHOW_LONG},
- {"max_delayed_threads", (char*) &max_insert_delayed_threads, SHOW_LONG},
- {"max_heap_table_size", (char*) &max_heap_table_size,SHOW_LONG},
- {"max_join_size", (char*) &max_join_size, SHOW_LONG},
- {"max_sort_length", (char*) &max_item_sort_length,SHOW_LONG},
- {"max_tmp_tables", (char*) &max_tmp_tables,SHOW_LONG},
- {"max_write_lock_count",(char*) &max_write_lock_count,SHOW_LONG},
- {"myisam_sort_buffer_size", (char*) &myisam_sort_buffer_size,SHOW_LONG},
- {"net_buffer_length", (char*) &net_buffer_length, SHOW_LONG},
- {"net_retry_count", (char*) &mysqld_net_retry_count, SHOW_LONG},
- {"pid_file", (char*) pidfile_name, SHOW_CHAR},
- {"port", (char*) &mysql_port, SHOW_INT},
- {"protocol_version", (char*) &protocol_version, SHOW_INT},
- {"record_buffer", (char*) &my_default_record_cache_size,SHOW_LONG},
- {"skip_locking", (char*) &my_disable_locking, SHOW_MY_BOOL},
- {"skip_networking", (char*) &opt_disable_networking, SHOW_BOOL},
- {"skip_show_database", (char*) &opt_skip_show_db, SHOW_BOOL},
- {"slow_launch_time", (char*) &slow_launch_time, SHOW_LONG},
- {"socket", (char*) &mysql_unix_port, SHOW_CHAR_PTR},
- {"sort_buffer", (char*) &sortbuff_size,SHOW_LONG},
- {"table_cache", (char*) &table_cache_size,SHOW_LONG},
- {"table_type", (char*) (&default_table_type_name), SHOW_CHAR_PTR},
+ {"bdb_cache_size", (char*) &berkeley_cache_size, SHOW_LONG},
+ {"bdb_home", (char*) &berkeley_home, SHOW_CHAR_PTR},
+ {"bdb_logdir", (char*) &berkeley_logdir, SHOW_CHAR_PTR},
+ {"bdb_tmpdir", (char*) &berkeley_tmpdir, SHOW_CHAR_PTR},
+#endif
+ {"character_set", default_charset, SHOW_CHAR},
+ {"character_sets", (char*) &charsets_list, SHOW_CHAR_PTR},
+ {"connect_timeout", (char*) &connect_timeout, SHOW_LONG},
+ {"concurrent_insert", (char*) &myisam_concurrent_insert, SHOW_MY_BOOL},
+ {"datadir", mysql_real_data_home, SHOW_CHAR},
+ {"delay_key_write", (char*) &myisam_delay_key_write, SHOW_MY_BOOL},
+ {"delayed_insert_limit", (char*) &delayed_insert_limit, SHOW_LONG},
+ {"delayed_insert_timeout", (char*) &delayed_insert_timeout, SHOW_LONG},
+ {"delayed_queue_size", (char*) &delayed_queue_size, SHOW_LONG},
+ {"join_buffer_size", (char*) &join_buff_size, SHOW_LONG},
+ {"flush", (char*) &myisam_flush, SHOW_MY_BOOL},
+ {"flush_time", (char*) &flush_time, SHOW_LONG},
+ {"init_file", (char*) &opt_init_file, SHOW_CHAR_PTR},
+ {"interactive_timeout", (char*) &net_interactive_timeout, SHOW_LONG},
+ {"key_buffer_size", (char*) &keybuff_size, SHOW_LONG},
+ {"language", language, SHOW_CHAR},
+ {"log", (char*) &opt_log, SHOW_BOOL},
+ {"log_update", (char*) &opt_update_log, SHOW_BOOL},
+ {"log_bin", (char*) &opt_bin_log, SHOW_BOOL},
+ {"log_slave_updates", (char*) &opt_log_slave_updates, SHOW_BOOL},
+ {"long_query_time", (char*) &long_query_time, SHOW_LONG},
+ {"low_priority_updates", (char*) &low_priority_updates, SHOW_BOOL},
+ {"lower_case_table_names", (char*) &lower_case_table_names, SHOW_LONG},
+ {"max_allowed_packet", (char*) &max_allowed_packet, SHOW_LONG},
+ {"max_connections", (char*) &max_connections, SHOW_LONG},
+ {"max_connect_errors", (char*) &max_connect_errors, SHOW_LONG},
+ {"max_delayed_threads", (char*) &max_insert_delayed_threads, SHOW_LONG},
+ {"max_heap_table_size", (char*) &max_heap_table_size, SHOW_LONG},
+ {"max_join_size", (char*) &max_join_size, SHOW_LONG},
+ {"max_sort_length", (char*) &max_item_sort_length, SHOW_LONG},
+ {"max_tmp_tables", (char*) &max_tmp_tables, SHOW_LONG},
+ {"max_write_lock_count", (char*) &max_write_lock_count, SHOW_LONG},
+ {"myisam_sort_buffer_size", (char*) &myisam_sort_buffer_size, SHOW_LONG},
+ {"net_buffer_length", (char*) &net_buffer_length, SHOW_LONG},
+ {"net_retry_count", (char*) &mysqld_net_retry_count, SHOW_LONG},
+ {"pid_file", (char*) pidfile_name, SHOW_CHAR},
+ {"port", (char*) &mysql_port, SHOW_INT},
+ {"protocol_version", (char*) &protocol_version, SHOW_INT},
+ {"record_buffer", (char*) &my_default_record_cache_size, SHOW_LONG},
+ {"skip_locking", (char*) &my_disable_locking, SHOW_MY_BOOL},
+ {"skip_networking", (char*) &opt_disable_networking, SHOW_BOOL},
+ {"skip_show_database", (char*) &opt_skip_show_db, SHOW_BOOL},
+ {"slow_launch_time", (char*) &slow_launch_time, SHOW_LONG},
+ {"socket", (char*) &mysql_unix_port, SHOW_CHAR_PTR},
+ {"sort_buffer", (char*) &sortbuff_size, SHOW_LONG},
+ {"table_cache", (char*) &table_cache_size, SHOW_LONG},
+ {"table_type", (char*) &default_table_type_name, SHOW_CHAR_PTR},
#ifdef HAVE_THR_SETCONCURRENCY
- {"thread_concurrency", (char*) &concurrency, SHOW_LONG},
+ {"thread_concurrency", (char*) &concurrency, SHOW_LONG},
#endif
- {"thread_stack", (char*) &thread_stack,SHOW_LONG},
- {"thread_cache_size", (char*) &thread_cache_size,SHOW_LONG},
+ {"thread_stack", (char*) &thread_stack, SHOW_LONG},
+ {"thread_cache_size", (char*) &thread_cache_size, SHOW_LONG},
#ifdef HAVE_TZNAME
- {"timezone", time_zone, SHOW_CHAR},
+ {"timezone", time_zone, SHOW_CHAR},
#endif
- {"tmp_table_size", (char*) &tmp_table_size,SHOW_LONG},
- {"tmpdir", (char*) &mysql_tmpdir,SHOW_CHAR_PTR},
- {"version", server_version, SHOW_CHAR},
- {"wait_timeout",(char*) &net_wait_timeout,SHOW_LONG},
- {NullS,NullS,SHOW_LONG}
+ {"tmp_table_size", (char*) &tmp_table_size, SHOW_LONG},
+ {"tmpdir", (char*) &mysql_tmpdir, SHOW_CHAR_PTR},
+ {"version", server_version, SHOW_CHAR},
+ {"wait_timeout", (char*) &net_wait_timeout, SHOW_LONG},
+ {NullS, NullS, SHOW_LONG}
};
struct show_var_st status_vars[]= {
- {"Aborted_clients", (char*) &aborted_threads, SHOW_LONG},
- {"Aborted_connects", (char*) &aborted_connects, SHOW_LONG},
- {"Bytes_received", (char*) &bytes_received, SHOW_LONG},
- {"Bytes_sent", (char*) &bytes_sent, SHOW_LONG},
- {"Connections", (char*) &thread_id, SHOW_LONG_CONST},
- {"Created_tmp_tables",(char*) &created_tmp_tables, SHOW_LONG},
- {"Delayed_insert_threads", (char*) &delayed_insert_threads, SHOW_LONG},
- {"Delayed_writes", (char*) &delayed_insert_writes, SHOW_LONG},
- {"Delayed_errors", (char*) &delayed_insert_errors, SHOW_LONG},
- {"Flush_commands", (char*) &refresh_version, SHOW_LONG_CONST},
- {"Handler_delete", (char*) &ha_delete_count, SHOW_LONG},
- {"Handler_read_first",(char*) &ha_read_first_count, SHOW_LONG},
- {"Handler_read_key", (char*) &ha_read_key_count, SHOW_LONG},
- {"Handler_read_next", (char*) &ha_read_next_count, SHOW_LONG},
- {"Handler_read_prev", (char*) &ha_read_prev_count, SHOW_LONG},
- {"Handler_read_rnd", (char*) &ha_read_rnd_count, SHOW_LONG},
- {"Handler_read_rnd_next", (char*) &ha_read_rnd_next_count, SHOW_LONG},
- {"Handler_update", (char*) &ha_update_count, SHOW_LONG},
- {"Handler_write", (char*) &ha_write_count, SHOW_LONG},
- {"Key_blocks_used", (char*) &_my_blocks_used, SHOW_LONG_CONST},
- {"Key_read_requests", (char*) &_my_cache_r_requests, SHOW_LONG},
- {"Key_reads", (char*) &_my_cache_read, SHOW_LONG},
- {"Key_write_requests",(char*) &_my_cache_w_requests, SHOW_LONG},
- {"Key_writes", (char*) &_my_cache_write, SHOW_LONG},
- {"Max_used_connections", (char*) &max_used_connections, SHOW_LONG},
- {"Not_flushed_key_blocks", (char*) &_my_blocks_changed, SHOW_LONG_CONST},
- {"Not_flushed_delayed_rows", (char*) &delayed_rows_in_use, SHOW_LONG_CONST},
- {"Open_tables", (char*) 0, SHOW_OPENTABLES},
- {"Open_files", (char*) &my_file_opened, SHOW_INT_CONST},
- {"Open_streams", (char*) &my_stream_opened, SHOW_INT_CONST},
- {"Opened_tables", (char*) &opened_tables, SHOW_LONG},
- {"Questions", (char*) 0, SHOW_QUESTION},
- {"Slow_launch_threads", (char*) &slow_launch_threads, SHOW_LONG},
- {"Slow_queries", (char*) &long_query_count, SHOW_LONG},
- {"Slave_running", (char*) &slave_running, SHOW_BOOL},
- {"Threads_cached", (char*) &cached_thread_count, SHOW_LONG_CONST},
- {"Threads_connected", (char*) &thread_count, SHOW_INT_CONST},
- {"Threads_running", (char*) &thread_running, SHOW_INT_CONST},
- {"Uptime", (char*) 0, SHOW_STARTTIME},
- {NullS,NullS,SHOW_LONG}
+ {"Aborted_clients", (char*) &aborted_threads, SHOW_LONG},
+ {"Aborted_connects", (char*) &aborted_connects, SHOW_LONG},
+ {"Bytes_received", (char*) &bytes_received, SHOW_LONG},
+ {"Bytes_sent", (char*) &bytes_sent, SHOW_LONG},
+ {"Connections", (char*) &thread_id, SHOW_LONG_CONST},
+ {"Created_tmp_tables", (char*) &created_tmp_tables, SHOW_LONG},
+ {"Delayed_insert_threads", (char*) &delayed_insert_threads, SHOW_LONG},
+ {"Delayed_writes", (char*) &delayed_insert_writes, SHOW_LONG},
+ {"Delayed_errors", (char*) &delayed_insert_errors, SHOW_LONG},
+ {"Flush_commands", (char*) &refresh_version, SHOW_LONG_CONST},
+ {"Handler_delete", (char*) &ha_delete_count, SHOW_LONG},
+ {"Handler_read_first", (char*) &ha_read_first_count, SHOW_LONG},
+ {"Handler_read_key", (char*) &ha_read_key_count, SHOW_LONG},
+ {"Handler_read_next", (char*) &ha_read_next_count, SHOW_LONG},
+ {"Handler_read_prev", (char*) &ha_read_prev_count, SHOW_LONG},
+ {"Handler_read_rnd", (char*) &ha_read_rnd_count, SHOW_LONG},
+ {"Handler_read_rnd_next", (char*) &ha_read_rnd_next_count, SHOW_LONG},
+ {"Handler_update", (char*) &ha_update_count, SHOW_LONG},
+ {"Handler_write", (char*) &ha_write_count, SHOW_LONG},
+ {"Key_blocks_used", (char*) &_my_blocks_used, SHOW_LONG_CONST},
+ {"Key_read_requests", (char*) &_my_cache_r_requests, SHOW_LONG},
+ {"Key_reads", (char*) &_my_cache_read, SHOW_LONG},
+ {"Key_write_requests", (char*) &_my_cache_w_requests, SHOW_LONG},
+ {"Key_writes", (char*) &_my_cache_write, SHOW_LONG},
+ {"Max_used_connections", (char*) &max_used_connections, SHOW_LONG},
+ {"Not_flushed_key_blocks", (char*) &_my_blocks_changed, SHOW_LONG_CONST},
+ {"Not_flushed_delayed_rows", (char*) &delayed_rows_in_use, SHOW_LONG_CONST},
+ {"Open_tables", (char*) 0, SHOW_OPENTABLES},
+ {"Open_files", (char*) &my_file_opened, SHOW_INT_CONST},
+ {"Open_streams", (char*) &my_stream_opened, SHOW_INT_CONST},
+ {"Opened_tables", (char*) &opened_tables, SHOW_LONG},
+ {"Questions", (char*) 0, SHOW_QUESTION},
+ {"Slow_launch_threads", (char*) &slow_launch_threads, SHOW_LONG},
+ {"Slow_queries", (char*) &long_query_count, SHOW_LONG},
+ {"Slave_running", (char*) &slave_running, SHOW_BOOL},
+ {"Threads_cached", (char*) &cached_thread_count, SHOW_LONG_CONST},
+ {"Threads_connected", (char*) &thread_count, SHOW_INT_CONST},
+ {"Threads_running", (char*) &thread_running, SHOW_INT_CONST},
+ {"Uptime", (char*) 0, SHOW_STARTTIME},
+ {NullS, NullS, SHOW_LONG}
};
static void print_version(void)
@@ -2444,7 +2470,8 @@ static void usage(void)
{
print_version();
puts("Copyright (C) 2000 MySQL AB & MySQL Finland AB, by Monty and others");
- puts("This software comes with ABSOLUTELY NO WARRANTY. This is free software,\nand you are welcome to modify and redistribute it under the GPL license\n");
+ puts("This software comes with ABSOLUTELY NO WARRANTY. This is free software,");
+ puts("and you are welcome to modify and redistribute it under the GPL license\n");
puts("Starts the MySQL server\n");
printf("Usage: %s [OPTIONS]\n", my_progname);
@@ -2489,7 +2516,8 @@ static void usage(void)
--log-long-format Log some extra information to update log\n\
--low-priority-updates INSERT/DELETE/UPDATE has lower priority than selects\n\
--log-slow-queries=[file]\n\
- Log slow queries to this log file\n\
+ Log slow queries to this log file. Defaults logging\n\
+ to hostname-slow.log\n\
--pid-file=path Pid file used by safe_mysqld\n\
-P, --port=... Port number to use for connection\n\
-n, --new Use very new possible 'unsafe' functions\n\
--
2.30.9