← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/drizzled.cc

A couple small fixes from last patches.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
448
448
void close_connections(void)
449
449
{
450
450
  /* Abort listening to new connections */
451
 
  (void) write(abort_pipe[1], "\0", 1);
 
451
  assert(write(abort_pipe[1], "\0", 1) == 1);
452
452
 
453
453
  /* kill connection thread */
454
454
  (void) pthread_mutex_lock(&LOCK_thread_count);
904
904
    }
905
905
  }
906
906
 
907
 
  if (pollfd_count == 0 && ai != NULL && ip_sock == -1)
 
907
  if (pollfd_count == 0 && ai != NULL)
908
908
  {
909
909
    sql_perror(ER(ER_IPSOCK_ERROR));            /* purecov: tested */
910
910
    unireg_abort(1);                            /* purecov: tested */