← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/drizzled.cc

  • Committer: Lee Bieber
  • Date: 2011-01-18 20:05:06 UTC
  • mfrom: (2094.1.6 build)
  • Revision ID: kalebral@gmail.com-20110118200506-r1v72y174j5x7j0i
Merge Brian - fix processlist test, was failing under lcov
Merge Marisa - fix bug 684803: Need to update Drizzledump documentation with migration conversions / caveats
Merge Marisa - fix bug #686641: Need to document removal of multi-table update/delete from Drizzle
Merge Monty - fix bug 567387: quotes now appearing around module name and author in data_dicionary view
Merge Monty - fix bug 658752: Incorrect datadir value being stored
Merge Andrew - fix bug 680872: max-connect-errors appears to be unused 
Merge Stewart - Haildb updates, ANALYZE table as well as improved index statistics

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
254
254
uint32_t server_id;
255
255
uint64_t table_cache_size;
256
256
size_t table_def_size;
257
 
uint64_t max_connect_errors;
258
257
uint32_t global_thread_id= 1UL;
259
258
pid_t current_pid;
260
259
 
814
813
  global_system_variables.max_allowed_packet= in_max_allowed_packet;
815
814
}
816
815
 
817
 
static void check_limits_mce(uint64_t in_max_connect_errors)
818
 
{
819
 
  max_connect_errors= MAX_CONNECT_ERRORS;
820
 
  if (in_max_connect_errors < 1 || in_max_connect_errors > ULONG_MAX)
821
 
  {
822
 
    cout << _("Error: Invalid Value for max_connect_errors");
823
 
    exit(-1);
824
 
  }
825
 
  max_connect_errors= in_max_connect_errors;
826
 
}
827
 
 
828
816
static void check_limits_max_err_cnt(uint64_t in_max_error_count)
829
817
{
830
818
  global_system_variables.max_error_count= DEFAULT_ERROR_COUNT;
1267
1255
  _("A global cap on the amount of memory that can be allocated by session join buffers (0 means unlimited)"))
1268
1256
  ("max-allowed-packet", po::value<uint32_t>(&global_system_variables.max_allowed_packet)->default_value(64*1024*1024L)->notifier(&check_limits_map),
1269
1257
  _("Max packetlength to send/receive from to server."))
1270
 
  ("max-connect-errors", po::value<uint64_t>(&max_connect_errors)->default_value(MAX_CONNECT_ERRORS)->notifier(&check_limits_mce),
1271
 
  _("If there is more than this number of interrupted connections from a "
1272
 
     "host this host will be blocked from further connections."))
1273
1258
  ("max-error-count", po::value<uint64_t>(&global_system_variables.max_error_count)->default_value(DEFAULT_ERROR_COUNT)->notifier(&check_limits_max_err_cnt),
1274
1259
  _("Max number of errors/warnings to store for a statement."))
1275
1260
  ("max-heap-table-size", po::value<uint64_t>(&global_system_variables.max_heap_table_size)->default_value(16*1024*1024L)->notifier(&check_limits_mhts),
1703
1688
  OPT_BACK_LOG,
1704
1689
  OPT_JOIN_BUFF_SIZE,
1705
1690
  OPT_MAX_ALLOWED_PACKET,
1706
 
  OPT_MAX_CONNECT_ERRORS,
1707
1691
  OPT_MAX_HEP_TABLE_SIZE,
1708
1692
  OPT_MAX_JOIN_SIZE,
1709
1693
  OPT_MAX_SORT_LENGTH,
1882
1866
   (char**) &global_system_variables.max_allowed_packet,
1883
1867
   (char**) &max_system_variables.max_allowed_packet, 0, GET_UINT32,
1884
1868
   REQUIRED_ARG, 64*1024*1024L, 1024, 1024L*1024L*1024L, MALLOC_OVERHEAD, 1024, 0},
1885
 
  {"max_connect_errors", OPT_MAX_CONNECT_ERRORS,
1886
 
   N_("If there is more than this number of interrupted connections from a "
1887
 
      "host this host will be blocked from further connections."),
1888
 
   (char**) &max_connect_errors, (char**) &max_connect_errors, 0, GET_UINT64,
1889
 
   REQUIRED_ARG, MAX_CONNECT_ERRORS, 1, ULONG_MAX, 0, 1, 0},
1890
1869
  {"max_heap_table_size", OPT_MAX_HEP_TABLE_SIZE,
1891
1870
   N_("Don't allow creation of heap tables bigger than this."),
1892
1871
   (char**) &global_system_variables.max_heap_table_size,