← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_base.cc

  • Committer: Brian Aker
  • Date: 2009-03-12 19:38:25 UTC
  • mto: This revision was merged to the branch mainline in revision 933.
  • Revision ID: brian@tangent.org-20090312193825-ggfxfjgodckoa13y
Pushing thread attribute for threads down to engine.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_base.cc
6165
6165
 
6166
6166
void kill_drizzle(void)
6167
6167
{
6168
 
 
6169
 
#if defined(SIGNALS_DONT_BREAK_READ)
6170
 
  abort_loop=1;                                 // Break connection loops
6171
 
  close_server_sock();                          // Force accept to wake up
6172
 
#endif
6173
 
 
6174
6168
  pthread_kill(signal_thread, SIGTERM);
6175
 
  shutdown_in_progress=1;                       // Safety if kill didn't work
6176
 
#ifdef SIGNALS_DONT_BREAK_READ
6177
 
  if (!kill_in_progress)
6178
 
  {
6179
 
    pthread_t tmp;
6180
 
    abort_loop=1;
6181
 
    if (pthread_create(&tmp,&connection_attrib, kill_server_thread,
6182
 
                           (void*) 0))
6183
 
      errmsg_printf(ERRMSG_LVL_ERROR, _("Can't create thread to kill server"));
6184
 
  }
6185
 
#endif
6186
 
  return;;
 
6169
  shutdown_in_progress= 1;                      // Safety if kill didn't work
6187
6170
}