← 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: 2011-01-25 07:24:41 UTC
  • mfrom: (2104.3.14 alter-table)
  • Revision ID: brian@tangent.org-20110125072441-gf9f14lkxjhvvku9
Merge in alter/parser

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
69
69
#include "drizzled/module/load_list.h"
70
70
#include "drizzled/global_buffer.h"
71
71
 
 
72
#include "drizzled/debug.h"
 
73
 
72
74
#include "drizzled/definition/cache.h"
73
75
 
74
76
#include "drizzled/plugin/event_observer.h"
246
248
bool calling_initgroups= false; /**< Used in SIGSEGV handler. */
247
249
 
248
250
uint32_t drizzled_bind_timeout;
249
 
std::bitset<12> test_flags;
250
251
uint32_t dropping_tables, ha_open_options;
251
252
uint32_t tc_heuristic_recover= 0;
252
253
uint64_t session_startup_options;
581
582
  unireg_abort(1);
582
583
 
583
584
#ifdef PR_SET_DUMPABLE
584
 
  if (test_flags.test(TEST_CORE_ON_SIGNAL))
 
585
  if (getDebug().test(debug::CORE_ON_SIGNAL))
585
586
  {
586
587
    /* inform kernel that process is dumpable */
587
588
    (void) prctl(PR_SET_DUMPABLE, 1);
2078
2079
  opt_tc_log_file= (char *)"tc.log";      // no hostname in tc_log file name !
2079
2080
  cleanup_done= 0;
2080
2081
  dropping_tables= ha_open_options=0;
2081
 
  test_flags.reset();
 
2082
  getDebug().reset();
2082
2083
  wake_thread=0;
2083
2084
  abort_loop= select_thread_in_use= false;
2084
2085
  ready_to_exit= shutdown_in_progress= 0;
2233
2234
  {
2234
2235
    if (vm["exit-info"].as<long>())
2235
2236
    {
2236
 
      test_flags.set((uint32_t) vm["exit-info"].as<long>());
 
2237
      getDebug().set((uint32_t) vm["exit-info"].as<long>());
2237
2238
    }
2238
2239
  }
2239
2240
 
2240
2241
  if (vm.count("want-core"))
2241
2242
  {
2242
 
    test_flags.set(TEST_CORE_ON_SIGNAL);
 
2243
    getDebug().set(debug::CORE_ON_SIGNAL);
2243
2244
  }
2244
2245
 
2245
2246
  if (vm.count("skip-stack-trace"))
2246
2247
  {
2247
 
    test_flags.set(TEST_NO_STACKTRACE);
 
2248
    getDebug().set(debug::NO_STACKTRACE);
2248
2249
  }
2249
2250
 
2250
2251
  if (vm.count("skip-symlinks"))
2283
2284
  if (opt_debugging)
2284
2285
  {
2285
2286
    /* Allow break with SIGINT, no core or stack trace */
2286
 
    test_flags.set(TEST_SIGINT);
2287
 
    test_flags.set(TEST_NO_STACKTRACE);
2288
 
    test_flags.reset(TEST_CORE_ON_SIGNAL);
 
2287
    getDebug().set(debug::ALLOW_SIGINT);
 
2288
    getDebug().set(debug::NO_STACKTRACE);
 
2289
    getDebug().reset(debug::CORE_ON_SIGNAL);
2289
2290
  }
2290
2291
 
2291
2292
  if (drizzled_chroot)