← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/drizzled.cc

  • Committer: Andrew Hutchings
  • Date: 2010-10-20 09:00:18 UTC
  • mto: This revision was merged to the branch mainline in revision 1907.
  • Revision ID: andrew@linuxjedi.co.uk-20101020090018-0ab6bj7x20484aan
Add initial template work and test

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
63
63
#include "drizzled/drizzled.h"
64
64
#include "drizzled/module/registry.h"
65
65
#include "drizzled/module/load_list.h"
 
66
#include "drizzled/global_buffer.h"
66
67
 
67
68
#include <google/protobuf/stubs/common.h>
68
69
 
343
344
 
344
345
atomic<uint32_t> connection_count;
345
346
 
 
347
global_buffer_constraint<uint64_t> global_sort_buffer(MAX_SORT_MEMORY * 10);
 
348
 
346
349
/** 
347
350
  Refresh value. We use to test this to find out if a refresh even has happened recently.
348
351
*/
1321
1324
  ("sort-buffer-size",
1322
1325
  po::value<size_t>(&global_system_variables.sortbuff_size)->default_value(MAX_SORT_MEMORY)->notifier(&check_limits_sort_buffer_size),
1323
1326
  N_("Each thread that needs to do a sort allocates a buffer of this size."))
 
1327
  ("sort-heap-threshold",
 
1328
  po::value<uint64_t>()->default_value(MAX_SORT_MEMORY*10),
 
1329
  N_("A global cap on the amount of memory that can be allocated by session sort buffers"))
1324
1330
  ("table-definition-cache", po::value<size_t>(&table_def_size)->default_value(128)->notifier(&check_limits_tdc),
1325
1331
  N_("The number of cached table definitions."))
1326
1332
  ("table-open-cache", po::value<uint64_t>(&table_cache_size)->default_value(TABLE_OPEN_CACHE_DEFAULT)->notifier(&check_limits_toc),
2198
2204
      global_system_variables.log_warnings= atoi(vm["log-warnings"].as<string>().c_str());
2199
2205
  }
2200
2206
 
 
2207
  if (vm.count("sort-heap-threshold"))
 
2208
  {
 
2209
    global_sort_buffer.setMaxSize(vm["sort-heap-threshold"].as<uint64_t>());
 
2210
  }
 
2211
 
2201
2212
  if (vm.count("exit-info"))
2202
2213
  {
2203
2214
    if (vm["exit-info"].as<long>())