← 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: 2009-03-03 09:40:55 UTC
  • mto: (908.1.6 mordred)
  • mto: This revision was merged to the branch mainline in revision 910.
  • Revision ID: mordred@inaugust.com-20090303094055-q5pwpl04mvclnan4
Fixed new 64-bit caused solaris warnings.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
466
466
 
467
467
static void usage(void);
468
468
static void clean_up_mutexes(void);
469
 
static void drizzled_exit(int exit_code) __attribute__((noreturn));
470
469
extern "C" bool safe_read_error_impl(NET *net);
471
470
 
472
471
/****************************************************************************
636
635
  else if (opt_help)
637
636
    usage();
638
637
  clean_up(!opt_help && (exit_code)); /* purecov: inspected */
639
 
  drizzled_exit(exit_code);
640
 
}
641
 
 
642
 
 
643
 
static void drizzled_exit(int exit_code)
644
 
{
645
638
  clean_up_mutexes();
646
639
  my_end(opt_endinfo ? MY_CHECK_ERROR | MY_GIVE_INFO : 0);
647
640
  exit(exit_code); /* purecov: inspected */
775
768
      errmsg_printf(ERRMSG_LVL_ERROR, _("Fatal error: Please read \"Security\" section of "
776
769
                      "the manual to find out how to run drizzled as root!\n"));
777
770
    unireg_abort(1);
778
 
 
779
 
    return NULL;
780
771
  }
781
772
  /* purecov: begin tested */
782
773
  if (!strcmp(user,"root"))
808
799
  }
809
800
#endif
810
801
 
811
 
  return NULL;
812
802
}
813
803
 
814
804
static void set_user(const char *user, struct passwd *user_info_arg)
1710
1700
    }
1711
1701
    if (!ha_storage_engine_is_enabled(hton))
1712
1702
    {
1713
 
          errmsg_printf(ERRMSG_LVL_ERROR, _("Default storage engine (%s) is not available"),
1714
 
                      default_storage_engine_str);
 
1703
      errmsg_printf(ERRMSG_LVL_ERROR, _("Default storage engine (%s) is not available"),
 
1704
                    default_storage_engine_str);
1715
1705
      unireg_abort(1);
1716
 
      assert(global_system_variables.table_plugin);
 
1706
      //assert(global_system_variables.table_plugin);
1717
1707
    }
1718
1708
    else
1719
1709
    {
1894
1884
  (void) pthread_mutex_unlock(&LOCK_thread_count);
1895
1885
 
1896
1886
  clean_up(1);
1897
 
  drizzled_exit(0);
 
1887
  clean_up_mutexes();
 
1888
  my_end(opt_endinfo ? MY_CHECK_ERROR | MY_GIVE_INFO : 0);
 
1889
  return 0;
1898
1890
}
1899
1891
 
1900
1892