← 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 05:35:22 UTC
  • Revision ID: brian@tangent.org-20090320053522-x6m109899yixni24
Remove bad variables.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
229
229
static bool volatile ready_to_exit;
230
230
static bool opt_debugging= 0;
231
231
static uint32_t wake_thread;
232
 
static uint32_t killed_threads, thread_created;
 
232
static uint32_t killed_threads;
233
233
static char *drizzled_user, *drizzled_chroot;
234
234
static char *language_ptr, *opt_init_connect;
235
235
static char *default_character_set_name;
245
245
/* Global variables */
246
246
 
247
247
bool opt_bin_log;
248
 
bool opt_skip_show_db= false;
249
248
bool server_id_supplied = 0;
250
249
bool opt_endinfo, using_udf_functions;
251
250
bool locked_in_memory;
281
280
uint32_t delay_key_write_options, protocol_version= PROTOCOL_VERSION;
282
281
uint32_t lower_case_table_names= 1;
283
282
uint32_t tc_heuristic_recover= 0;
284
 
uint32_t volatile thread_running;
285
283
uint64_t session_startup_options;
286
284
uint32_t back_log;
287
285
uint32_t connect_timeout;
289
287
uint64_t table_cache_size;
290
288
uint64_t table_def_size;
291
289
uint64_t slow_launch_time;
292
 
uint64_t slave_open_temp_tables;
293
290
uint32_t refresh_version;  /* Increments on each reload */
294
291
uint64_t aborted_threads;
295
292
uint64_t aborted_connects;
420
417
static char *drizzle_home_ptr, *pidfile_name_ptr;
421
418
static int defaults_argc;
422
419
static char **defaults_argv;
423
 
static char *opt_bin_logname;
424
420
 
425
421
struct rand_struct sql_rand; ///< used by sql_class.cc:Session::Session()
426
422
 
616
612
    free_defaults(defaults_argv);
617
613
  free(sys_init_connect.value);
618
614
  free(drizzle_tmpdir);
619
 
  if (opt_bin_logname)
620
 
    free(opt_bin_logname);
621
615
  if (opt_secure_file_priv)
622
616
    free(opt_secure_file_priv);
623
617
  bitmap_free(&temp_pool);
1807
1801
  }
1808
1802
 
1809
1803
  init_status_vars();
1810
 
  /*
1811
 
    init_slave() must be called after the thread keys are created.
1812
 
    Some parts of the code (e.g. SHOW STATUS LIKE 'slave_running' and other
1813
 
    places) assume that active_mi != 0, so let's fail if it's 0 (out of
1814
 
    memory); a message has already been printed.
1815
 
  */
1816
1804
 
1817
1805
  errmsg_printf(ERRMSG_LVL_INFO, _(ER(ER_STARTUP)),my_progname,server_version,
1818
1806
                        "", drizzled_port, COMPILATION_COMMENT);
2691
2679
  {"Table_locks_immediate",    (char*) &locks_immediate,        SHOW_INT},
2692
2680
  {"Table_locks_waited",       (char*) &locks_waited,           SHOW_INT},
2693
2681
  {"Threads_connected",        (char*) &connection_count,       SHOW_INT},
2694
 
  {"Threads_created",          (char*) &thread_created,       SHOW_INT_NOFLUSH},
2695
 
  {"Threads_running",          (char*) &thread_running,         SHOW_INT},
2696
2682
  {"Uptime",                   (char*) &show_starttime_cont,         SHOW_FUNC},
2697
2683
  {"Uptime_since_flush_status",(char*) &show_flushstatustime_cont,   SHOW_FUNC},
2698
2684
  {NULL, NULL, SHOW_LONGLONG}
2761
2747
  /* Things reset to zero */
2762
2748
  drizzle_home[0]= pidfile_name[0]= 0;
2763
2749
  opt_bin_log= 0;
2764
 
  opt_skip_show_db=0;
2765
2750
  opt_logname= 0;
2766
2751
  opt_tc_log_file= (char *)"tc.log";      // no hostname in tc_log file name !
2767
2752
  opt_secure_file_priv= 0;
2771
2756
  defaults_argv= 0;
2772
2757
  server_id_supplied= 0;
2773
2758
  test_flags= select_errors= dropping_tables= ha_open_options=0;
2774
 
  thread_running= wake_thread=0;
2775
 
  slave_open_temp_tables= 0;
 
2759
  wake_thread=0;
2776
2760
  opt_endinfo= using_udf_functions= 0;
2777
2761
  opt_using_transactions= false;
2778
2762
  abort_loop= select_thread_in_use= false;
2780
2764
  aborted_threads= aborted_connects= 0;
2781
2765
  max_used_connections= 0;
2782
2766
  slow_launch_threads= 0;
2783
 
  drizzled_user= drizzled_chroot= opt_init_file= opt_bin_logname = 0;
 
2767
  drizzled_user= drizzled_chroot= opt_init_file= 0;
2784
2768
  my_bind_addr_str= NULL;
2785
2769
  memset(&global_status_var, 0, sizeof(global_status_var));
2786
2770
  key_map_full.set_all();