← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/signal_handler/signal_handler.cc

  • Committer: Andrew Hutchings
  • Date: 2010-09-08 19:03:09 UTC
  • mfrom: (1750 staging)
  • mto: (1750.1.1 build)
  • mto: This revision was merged to the branch mainline in revision 1751.
  • Revision ID: andrew@linuxjedi.co.uk-20100908190309-mya1nu7xvo1fpvk8
Merge trunk into branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/signal_handler/signal_handler.cc
25
25
#include "drizzled/plugin/daemon.h"
26
26
#include "drizzled/signal_handler.h"
27
27
 
 
28
#include "drizzled/drizzled.h"
 
29
 
28
30
#include <sys/stat.h>
29
31
#include <fcntl.h>
30
32
 
31
33
 
32
34
static bool kill_in_progress= false;
33
 
static bool volatile signal_thread_in_use= false;
34
35
extern "C" pthread_handler_t signal_hand(void *);
35
36
 
36
37
namespace drizzled
73
74
    errmsg_printf(ERRMSG_LVL_INFO, _(ER(ER_NORMAL_SHUTDOWN)),internal::my_progname);
74
75
  else
75
76
    errmsg_printf(ERRMSG_LVL_ERROR, _(ER(ER_GOT_SIGNAL)),internal::my_progname,sig);
76
 
 
77
77
  close_connections();
78
 
  if (sig != SIGTERM && sig != 0)
79
 
    unireg_abort(1);
80
 
  else
81
 
    unireg_end();
 
78
  clean_up(1);
82
79
}
83
80
 
84
81
/**