← Back to branch summary

~snowstalker/drizzle/startup-errors

« back to all changes in this revision

Viewing changes to drizzled/drizzled.cc

  • Committer: Brian Aker
  • Date: 2009-11-26 18:48:20 UTC
  • mfrom: (1226.1.3 push)
  • Revision ID: brian@gaz-20091126184820-hltr0upee0ahopsj
Bundle Brian + Monty  (been through staging, just collecting it as want
overall patch as seen by staging).

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
261
261
uint32_t back_log;
262
262
uint32_t server_id;
263
263
uint64_t table_cache_size;
264
 
uint64_t table_def_size;
 
264
size_t table_def_size;
265
265
uint64_t aborted_threads;
266
266
uint64_t aborted_connects;
267
267
uint64_t max_connect_errors;
1142
1142
  {"insert_select",        (char*) offsetof(STATUS_VAR, com_stat[(uint32_t) SQLCOM_INSERT_SELECT]), SHOW_LONG_STATUS},
1143
1143
  {"kill",                 (char*) offsetof(STATUS_VAR, com_stat[(uint32_t) SQLCOM_KILL]), SHOW_LONG_STATUS},
1144
1144
  {"load",                 (char*) offsetof(STATUS_VAR, com_stat[(uint32_t) SQLCOM_LOAD]), SHOW_LONG_STATUS},
1145
 
  {"optimize",             (char*) offsetof(STATUS_VAR, com_stat[(uint32_t) SQLCOM_OPTIMIZE]), SHOW_LONG_STATUS},
1146
1145
  {"release_savepoint",    (char*) offsetof(STATUS_VAR, com_stat[(uint32_t) SQLCOM_RELEASE_SAVEPOINT]), SHOW_LONG_STATUS},
1147
1146
  {"rename_table",         (char*) offsetof(STATUS_VAR, com_stat[(uint32_t) SQLCOM_RENAME_TABLE]), SHOW_LONG_STATUS},
1148
1147
  {"replace",              (char*) offsetof(STATUS_VAR, com_stat[(uint32_t) SQLCOM_REPLACE]), SHOW_LONG_STATUS},
1384
1383
  */
1385
1384
  if (table_cache_init())
1386
1385
    unireg_abort(1);
1387
 
  if (TableShare::cacheStart())
1388
 
    unireg_abort(1);
 
1386
  TableShare::cacheStart();
1389
1387
 
1390
1388
  setup_fpu();
1391
1389
  init_thr_lock();
2075
2073
  {"table_definition_cache", OPT_TABLE_DEF_CACHE,
2076
2074
   N_("The number of cached table definitions."),
2077
2075
   (char**) &table_def_size, (char**) &table_def_size,
2078
 
   0, GET_ULL, REQUIRED_ARG, 128, 1, 512*1024L, 0, 1, 0},
 
2076
   0, GET_SIZE, REQUIRED_ARG, 128, 1, 512*1024L, 0, 1, 0},
2079
2077
  {"table_open_cache", OPT_TABLE_OPEN_CACHE,
2080
2078
   N_("The number of cached open tables."),
2081
2079
   (char**) &table_cache_size, (char**) &table_cache_size, 0, GET_UINT64,