← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/drizzled.cc

  • Committer: Stewart Smith
  • Date: 2009-10-12 05:13:54 UTC
  • mfrom: (1178 staging)
  • mto: This revision was merged to the branch mainline in revision 1179.
  • Revision ID: stewart@flamingspork.com-20091012051354-2n7zpid9f67ddsa0
merge lp:drizzle/build

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
257
257
  requires a 4-byte integer.
258
258
*/
259
259
uint32_t drizzled_tcp_port;
260
 
char *drizzled_bind_host;
261
260
uint32_t drizzled_bind_timeout;
262
261
std::bitset<12> test_flags;
263
262
uint32_t dropping_tables, ha_open_options;
1692
1691
  (void) pthread_mutex_unlock(&LOCK_thread_count);
1693
1692
 
1694
1693
  clean_up(1);
 
1694
  plugin::Registry::shutdown();
1695
1695
  clean_up_mutexes();
1696
1696
  my_end(opt_endinfo ? MY_CHECK_ERROR | MY_GIVE_INFO : 0);
1697
1697
  return 0;
1792
1792
      "relative to this."),
1793
1793
   (char**) &drizzle_home_ptr, (char**) &drizzle_home_ptr, 0, GET_STR, REQUIRED_ARG,
1794
1794
   0, 0, 0, 0, 0, 0},
1795
 
  {"bind-address", OPT_BIND_ADDRESS, N_("IP address to bind to."),
1796
 
   (char**) &drizzled_bind_host, (char**) &drizzled_bind_host, 0, GET_STR,
1797
 
   REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
1798
1795
  {"chroot", 'r',
1799
1796
   N_("Chroot drizzled daemon during startup."),
1800
1797
   (char**) &drizzled_chroot, (char**) &drizzled_chroot, 0, GET_STR, REQUIRED_ARG,
2030
2027
   (char**) &global_system_variables.min_examined_row_limit,
2031
2028
   (char**) &max_system_variables.min_examined_row_limit, 0, GET_ULL,
2032
2029
   REQUIRED_ARG, 0, 0, ULONG_MAX, 0, 1L, 0},
2033
 
  {"net_buffer_length", OPT_NET_BUFFER_LENGTH,
2034
 
   N_("Buffer length for TCP/IP and socket communication."),
2035
 
   (char**) &global_system_variables.net_buffer_length,
2036
 
   (char**) &max_system_variables.net_buffer_length, 0, GET_UINT32,
2037
 
   REQUIRED_ARG, 16384, 1024, 1024*1024L, 0, 1024, 0},
2038
2030
  {"optimizer_prune_level", OPT_OPTIMIZER_PRUNE_LEVEL,
2039
2031
    N_("Controls the heuristic(s) applied during query optimization to prune "
2040
2032
       "less-promising partial plans from the optimizer search space. Meaning: "
2221
2213
  aborted_threads= aborted_connects= 0;
2222
2214
  max_used_connections= 0;
2223
2215
  drizzled_user= drizzled_chroot= 0;
2224
 
  drizzled_bind_host= NULL;
2225
2216
  memset(&global_status_var, 0, sizeof(global_status_var));
2226
2217
  key_map_full.set();
2227
2218