~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/signal_handler.cc

  • Committer: Andrew Hutchings
  • Date: 2010-12-06 19:36:53 UTC
  • mfrom: (1976 staging)
  • mto: This revision was merged to the branch mainline in revision 1991.
  • Revision ID: andrew@linuxjedi.co.uk-20101206193653-l85vryv18jb0yxx8
Merge with trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
24
24
#include "drizzled/signal_handler.h"
25
25
#include "drizzled/drizzled.h"
26
26
#include "drizzled/session.h"
27
 
#include "drizzled/session_list.h"
 
27
#include "drizzled/session/cache.h"
28
28
#include "drizzled/internal/my_sys.h"
29
29
#include "drizzled/probes.h"
30
30
#include "drizzled/plugin.h"
49
49
void drizzled_print_signal_warning(int sig)
50
50
{
51
51
  if (global_system_variables.log_warnings)
52
 
    errmsg_printf(ERRMSG_LVL_WARN, _("Got signal %d from thread %"PRIu64),
 
52
    errmsg_printf(ERRMSG_LVL_WARN, _("Got signal %d from thread %"PRIu32),
53
53
                  sig, global_thread_id);
54
54
#ifndef HAVE_BSD_SIGNALS
55
55
  sigset_t set;