← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/drizzled.cc

  • Committer: Brian Aker
  • Date: 2009-03-20 17:21:50 UTC
  • Revision ID: brian@tangent.org-20090320172150-n5js0mbkf5719ufv
Remove dead options.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
249
249
bool locked_in_memory;
250
250
bool volatile abort_loop;
251
251
bool volatile shutdown_in_progress;
252
 
bool opt_local_infile;
253
252
uint32_t max_used_connections;
254
253
const char *opt_scheduler= "multi_thread";
255
254
 
1993
1992
  OPT_ISAM_LOG=256,
1994
1993
  OPT_SOCKET,
1995
1994
  OPT_BIND_ADDRESS,            OPT_PID_FILE,
1996
 
  OPT_FLUSH,                   OPT_SAFE,
1997
1995
  OPT_STORAGE_ENGINE,          
1998
1996
  OPT_INIT_FILE,
1999
1997
  OPT_DELAY_KEY_WRITE_ALL,
2010
2008
  OPT_LOCAL_INFILE,
2011
2009
  OPT_BACK_LOG,
2012
2010
  OPT_CONNECT_TIMEOUT,
2013
 
  OPT_FLUSH_TIME,
2014
 
  OPT_INTERACTIVE_TIMEOUT, OPT_JOIN_BUFF_SIZE,
 
2011
  OPT_JOIN_BUFF_SIZE,
2015
2012
  OPT_KEY_BUFFER_SIZE, OPT_KEY_CACHE_BLOCK_SIZE,
2016
2013
  OPT_KEY_CACHE_DIVISION_LIMIT, OPT_KEY_CACHE_AGE_THRESHOLD,
2017
 
  OPT_LONG_QUERY_TIME,
2018
 
  OPT_LOWER_CASE_TABLE_NAMES, OPT_MAX_ALLOWED_PACKET,
 
2014
  OPT_MAX_ALLOWED_PACKET,
2019
2015
  OPT_MAX_CONNECT_ERRORS,
2020
2016
  OPT_MAX_HEP_TABLE_SIZE,
2021
2017
  OPT_MAX_JOIN_SIZE,
2022
 
  OPT_MAX_RELAY_LOG_SIZE, OPT_MAX_SORT_LENGTH,
 
2018
  OPT_MAX_SORT_LENGTH,
2023
2019
  OPT_MAX_SEEKS_FOR_KEY, OPT_MAX_TMP_TABLES, OPT_MAX_USER_CONNECTIONS,
2024
2020
  OPT_MAX_LENGTH_FOR_SORT_DATA,
2025
2021
  OPT_MAX_WRITE_LOCK_COUNT, OPT_BULK_INSERT_BUFFER_SIZE,
2047
2043
  OPT_LC_TIME_NAMES,
2048
2044
  OPT_INIT_CONNECT,
2049
2045
  OPT_DEFAULT_TIME_ZONE,
2050
 
  OPT_SYSDATE_IS_NOW,
2051
2046
  OPT_OPTIMIZER_SEARCH_DEPTH,
2052
2047
  OPT_SCHEDULER,
2053
2048
  OPT_OPTIMIZER_PRUNE_LEVEL,
2054
 
  OPT_UPDATABLE_VIEWS_WITH_LIMIT,
2055
2049
  OPT_AUTO_INCREMENT, OPT_AUTO_INCREMENT_OFFSET,
2056
2050
  OPT_ENABLE_LARGE_PAGES,
2057
2051
  OPT_TIMED_MUTEXES,
2061
2055
  OPT_PORT_OPEN_TIMEOUT,
2062
2056
  OPT_KEEP_FILES_ON_CREATE,
2063
2057
  OPT_SECURE_FILE_PRIV,
2064
 
  OPT_MIN_EXAMINED_ROW_LIMIT,
2065
 
  OPT_OLD_MODE
 
2058
  OPT_MIN_EXAMINED_ROW_LIMIT
2066
2059
};
2067
2060
 
2068
2061
 
2149
2142
  {"exit-info", 'T',
2150
2143
   N_("Used for debugging;  Use at your own risk!"),
2151
2144
   0, 0, 0, GET_LONG, OPT_ARG, 0, 0, 0, 0, 0, 0},
2152
 
  {"flush", OPT_FLUSH,
2153
 
   N_("Flush tables to disk between SQL commands."),
2154
 
   0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
2155
2145
  /* We must always support the next option to make scripts like mysqltest
2156
2146
     easier to do */
2157
2147
  {"gdb", OPT_DEBUGGING,
2175
2165
   (char**) &lc_time_names_name,
2176
2166
   (char**) &lc_time_names_name,
2177
2167
   0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
2178
 
  {"local-infile", OPT_LOCAL_INFILE,
2179
 
   N_("Enable/disable LOAD DATA LOCAL INFILE (takes values 1|0)."),
2180
 
   (char**) &opt_local_infile,
2181
 
   (char**) &opt_local_infile, 0, GET_BOOL, OPT_ARG,
2182
 
   1, 0, 0, 0, 0, 0},
2183
2168
  {"log", 'l',
2184
2169
   N_("Log connections and queries to file."),
2185
2170
   (char**) &opt_logname,
2222
2207
      "(Default: no wait)"),
2223
2208
   (char**) &drizzled_port_timeout,
2224
2209
   (char**) &drizzled_port_timeout, 0, GET_UINT, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
2225
 
  {"safe-mode", OPT_SAFE,
2226
 
   N_("Skip some optimize stages (for testing)."),
2227
 
   0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
2228
2210
  {"secure-file-priv", OPT_SECURE_FILE_PRIV,
2229
2211
   N_("Limit LOAD DATA, SELECT ... OUTFILE, and LOAD_FILE() to files "
2230
2212
      "within specified directory"),