~drizzle-trunk/drizzle/development

Make exit happen in main thread rather than signal handler thread thus avoiding a segfault due to a double kill of the signal handler thread

added added

removed removed

#include "drizzled/plugin/daemon.h"

#include "drizzled/signal_handler.h"

#include "drizzled/drizzled.h"

#include <sys/stat.h>

#include <fcntl.h>

static bool kill_in_progress= false;

static bool volatile signal_thread_in_use= false;

//static bool volatile signal_thread_in_use= false;

extern "C" pthread_handler_t signal_hand(void *);

namespace drizzled

errmsg_printf(ERRMSG_LVL_INFO, _(ER(ER_NORMAL_SHUTDOWN)),internal::my_progname);

else

errmsg_printf(ERRMSG_LVL_ERROR, _(ER(ER_GOT_SIGNAL)),internal::my_progname,sig);

ready_to_exit= true;

close_connections();

if (sig != SIGTERM && sig != 0)

unireg_abort(1);

else

unireg_end();

}

/**