← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/drizzled.cc

  • Committer: Monty Taylor
  • Date: 2008-12-17 18:23:08 UTC
  • mfrom: (685.3.3 mysys-slimdown)
  • mto: This revision was merged to the branch mainline in revision 713.
  • Revision ID: monty@inaugust.com-20081217182308-bcuztplharskm9yh
Merged from Toru.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
878
878
  {
879
879
    if (pthread_kill(signal_thread, DRIZZLE_KILL_SIGNAL) != ESRCH)
880
880
      break;
881
 
    my_sleep(100);                              // Give it time to die
 
881
    usleep(100);                                // Give it time to die
882
882
  }
883
883
}
884
884
 
1269
1269
 
1270
1270
  segfaulted = 1;
1271
1271
 
1272
 
  curr_time= my_time(0);
 
1272
  if((curr_time= time(0)) == (time_t)-1)
 
1273
  {
 
1274
    fprintf(stderr, "Fetal: time() call failed\n");
 
1275
    exit(1);
 
1276
  }
 
1277
 
1273
1278
  localtime_r(&curr_time, &tm);
1274
1279
 
1275
1280
  fprintf(stderr,"%02d%02d%02d %2d:%02d:%02d - drizzled got "
1827
1832
};
1828
1833
 
1829
1834
static int init_common_variables(const char *conf_file_name, int argc,
1830
 
                                 char **argv, const char **groups)
 
1835
                                 char **argv, const char **groups)
1831
1836
{
 
1837
  time_t current;
1832
1838
  umask(((~my_umask) & 0666));
1833
1839
  my_decimal_set_zero(&decimal_zero); // set decimal_zero constant;
1834
1840
  tzset();                      // Set tzname
1835
1841
 
 
1842
  if ((current= time(0)) == (time_t)-1)
 
1843
    return 1;
 
1844
 
1836
1845
  max_system_variables.pseudo_thread_id= UINT32_MAX;
1837
 
  server_start_time= flush_status_time= my_time(0);
 
1846
  server_start_time= flush_status_time= current;
1838
1847
 
1839
1848
  if (init_thread_environment())
1840
1849
    return 1;