Merge lp:~linuxjedi/drizzle/drizzle-bug-625335 into lp:~drizzle-trunk/drizzle/development

[Andrew Hutchings]

The signal handler thread executed the shutdown code rather than the main thread. This means the signal handler thread was exited then the main thread unloaded the plugin which again tried to kill the signal handler thread causing a segfault in pthread_kill.

This moves the shutdown back to the main thread.

[lp:~linuxjedi/drizzle/drizzle-bug-625335]

1735. By LinuxJedi <linuxjedi@linuxjedi-laptop> on 2010-08-28

Remove commented out line

[Monty Taylor (mordred)]

Good catch.

review: Approve

[lp:~linuxjedi/drizzle/drizzle-bug-625335]

1736. By LinuxJedi <linuxjedi@linuxjedi-laptop> on 2010-08-30

Fix valgrind warnings (plus make exit clean up properly)

[Andrew Hutchings (linuxjedi)]

Recommitted to fix valgrind warnings

=== modified file 'drizzled/signal_handler.h'
--- drizzled/signal_handler.h	2010-04-01 18:07:18 +0000
+++ drizzled/signal_handler.h	2010-08-30 16:52:57 +0000
@@ -25,7 +25,7 @@
 
 #include <cstdlib>
 #include <cassert>
-
+static bool volatile signal_thread_in_use= false;
 extern "C" void drizzled_print_signal_warning(int sig);
 extern "C" void drizzled_handle_segfault(int sig);
 extern "C" void drizzled_end_thread_signal(int sig);

=== modified file 'plugin/signal_handler/signal_handler.cc'
--- plugin/signal_handler/signal_handler.cc	2010-08-18 16:12:58 +0000
+++ plugin/signal_handler/signal_handler.cc	2010-08-30 16:52:57 +0000
@@ -25,12 +25,13 @@
 #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;
 extern "C" pthread_handler_t signal_hand(void *);
 
 namespace drizzled
@@ -73,12 +74,8 @@
     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);
-
   close_connections();
-  if (sig != SIGTERM && sig != 0)
-    unireg_abort(1);
-  else
-    unireg_end();
+  clean_up(1);
 }
 
 /**