← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/drizzled.cc

merge with latest from the trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
512
512
static void wait_for_signal_thread_to_end(void);
513
513
static void create_pid_file();
514
514
static void drizzled_exit(int exit_code) __attribute__((noreturn));
 
515
bool safe_read_error_impl(NET *net);
515
516
 
516
517
/****************************************************************************
517
518
** Code to end drizzled
2435
2436
 
2436
2437
  network_init();
2437
2438
 
 
2439
  safe_read_error_hook= safe_read_error_impl; 
2438
2440
 
2439
2441
  /*
2440
2442
    init signals & alarm
4574
4576
  pthread_mutex_unlock(&LOCK_thread_count);
4575
4577
}
4576
4578
 
 
4579
bool safe_read_error_impl(NET *net)
 
4580
{
 
4581
  if (net->vio)
 
4582
    return vio_was_interrupted(net->vio);
 
4583
  return false;
 
4584
}
 
4585
 
4577
4586
 
4578
4587
/*****************************************************************************
4579
4588
  Instantiate templates