← 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: Monty Taylor
  • Date: 2009-05-20 23:11:54 UTC
  • mto: (1022.4.2 update-to-gcc-44)
  • mto: This revision was merged to the branch mainline in revision 1031.
  • Revision ID: mordred@inaugust.com-20090520231154-aosykdgtgfk4bk0y
Fixed the fix on solaris.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/signal_handler/signal_handler.cc
39
39
    or stop, we just want to kill the server.
40
40
*/
41
41
 
42
 
static void *kill_server(void *sig_ptr)
 
42
static void kill_server(void *sig_ptr)
43
43
{
44
44
  int sig=(int) (long) sig_ptr;                 // This is passed a int
45
45
  // if there is a signal during the kill in progress, ignore the other
46
46
  if (kill_in_progress)                         // Safety
47
 
    return NULL;
 
47
    return;
48
48
  kill_in_progress=true;
49
49
  abort_loop=1;                                 // This should be set
50
50
  if (sig != 0) // 0 is not a valid signal number
58
58
  if (sig != SIGTERM && sig != 0)
59
59
    unireg_abort(1);                            /* purecov: inspected */
60
60
  else
61
 
  {
62
61
    unireg_end();
63
 
#if !defined(SIGNALS_DONT_BREAK_READ)
64
 
    my_thread_end();
65
 
    pthread_exit(0);
66
 
#endif
67
 
  }
68
62
}
69
63
 
70
64
/**