← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/main.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/main.cc
63
63
#include "drizzled/transaction_services.h"
64
64
#include "drizzled/catalog/local.h"
65
65
 
 
66
#include <drizzled/debug.h>
 
67
 
66
68
#include "drizzled/util/backtrace.h"
67
69
 
68
70
using namespace drizzled;
127
129
      session->no_warnings_for_error= false;
128
130
      }
129
131
    }
130
 
    if (!session || MyFlags & ME_NOREFRESH)
131
 
        errmsg_printf(ERRMSG_LVL_ERROR, "%s: %s",internal::my_progname,str);
 
132
 
 
133
    if (not session || MyFlags & ME_NOREFRESH)
 
134
    {
 
135
      errmsg_printf(ERRMSG_LVL_ERROR, "%s: %s",internal::my_progname,str);
 
136
    }
132
137
}
133
138
 
134
139
static void init_signals(void)
136
141
  sigset_t set;
137
142
  struct sigaction sa;
138
143
 
139
 
  if (!(test_flags.test(TEST_NO_STACKTRACE) || 
140
 
        test_flags.test(TEST_CORE_ON_SIGNAL)))
 
144
  if (not (getDebug().test(debug::NO_STACKTRACE) || 
 
145
        getDebug().test(debug::CORE_ON_SIGNAL)))
141
146
  {
142
147
    sa.sa_flags = SA_RESETHAND | SA_NODEFER;
143
148
    sigemptyset(&sa.sa_mask);
153
158
    sigaction(SIGFPE, &sa, NULL);
154
159
  }
155
160
 
156
 
  if (test_flags.test(TEST_CORE_ON_SIGNAL))
 
161
  if (getDebug().test(debug::CORE_ON_SIGNAL))
157
162
  {
158
163
    /* Change limits so that we will get a core file */
159
164
    struct rlimit rl;
184
189
#ifdef SIGTSTP
185
190
  sigaddset(&set,SIGTSTP);
186
191
#endif
187
 
  if (test_flags.test(TEST_SIGINT))
 
192
  if (getDebug().test(debug::ALLOW_SIGINT))
188
193
  {
189
194
    sa.sa_flags= 0;
190
195
    sa.sa_handler= drizzled_end_thread_signal;