← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/drizzled.cc

  • Committer: Stewart Smith
  • Date: 2010-03-30 13:10:50 UTC
  • mfrom: (1283.34.4)
  • mto: (1283.37.1)
  • mto: This revision was merged to the branch mainline in revision 1475.
  • Revision ID: stewart@flamingspork.com-20100330131050-b3hwar8bihn1s1qf
Merged embedded-innodb-full-index-read into embedded-innodb-position-rnd-pos.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
376
376
extern "C" pthread_handler_t signal_hand(void *arg);
377
377
static void drizzle_init_variables(void);
378
378
static void get_options(int *argc,char **argv);
379
 
bool drizzled_get_one_option(int, const struct my_option *, char *);
 
379
int drizzled_get_one_option(int, const struct my_option *, char *);
380
380
static int init_thread_environment();
381
381
static const char *get_relative_path(const char *path);
382
382
static void fix_paths(string &progname);
1870
1870
}
1871
1871
 
1872
1872
 
1873
 
bool drizzled_get_one_option(int optid, const struct my_option *opt,
 
1873
int drizzled_get_one_option(int optid, const struct my_option *opt,
1874
1874
                             char *argument)
1875
1875
{
1876
1876
  switch(optid) {
1938
1938
      if (getaddrinfo(argument, NULL, &hints, &res_lst) != 0)
1939
1939
      {
1940
1940
          errmsg_printf(ERRMSG_LVL_ERROR, _("Can't start server: cannot resolve hostname!"));
1941
 
        exit(1);
 
1941
        return EXIT_ARGUMENT_INVALID;
1942
1942
      }
1943
1943
 
1944
1944
      if (res_lst->ai_next)
1945
1945
      {
1946
1946
          errmsg_printf(ERRMSG_LVL_ERROR, _("Can't start server: bind-address refers to "
1947
1947
                          "multiple interfaces!"));
1948
 
        exit(1);
 
1948
        return EXIT_ARGUMENT_INVALID;
1949
1949
      }
1950
1950
      freeaddrinfo(res_lst);
1951
1951
    }