← 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: lbieber
  • Date: 2010-10-08 01:11:05 UTC
  • mfrom: (1821.1.4 build)
  • Revision ID: lbieber@orisndriz08-20101008011105-1tbwbvz9me9fy7ua
Merge Monty - Fixed the last of the ICC warnings. Turned on warnings=errors
Merge Brian - fixu bug #655558: SELECT 102/(1-1) should error on divide by zero          
Merge Brian - fix bug #654219: information_schema.key_column_usage does not contain information about FKs

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/signal_handler/signal_handler.cc
63
63
    or stop, we just want to kill the server.
64
64
*/
65
65
 
66
 
static void kill_server(void *sig_ptr)
 
66
static void kill_server(int sig)
67
67
{
68
 
  int sig=(int) (long) sig_ptr;                 // This is passed a int
69
68
  // if there is a signal during the kill in progress, ignore the other
70
69
  if (kill_in_progress)                         // Safety
71
70
    return;
197
196
      if (!abort_loop)
198
197
      {
199
198
        abort_loop=1;                           // mark abort for threads
200
 
        kill_server((void*) sig);       // MIT THREAD has a alarm thread
 
199
        kill_server(sig);               // MIT THREAD has a alarm thread
201
200
      }
202
201
      break;
203
202
    case SIGHUP: