← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/drizzled.cc

  • Committer: Djellel E. Difallah
  • Date: 2010-03-30 09:29:02 UTC
  • mfrom: (1410.4.2 ded-my-tree)
  • mto: This revision was merged to the branch mainline in revision 1440.
  • Revision ID: ded@ubuntu-20100330092902-hayr13f78x5mvl3y
update references to old my_'s

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
77
77
 
78
78
#include <errno.h>
79
79
#include <sys/stat.h>
80
 
#include "drizzled/my_getopt.h"
 
80
#include "drizzled/option.h"
81
81
#ifdef HAVE_SYSENT_H
82
82
#include <sysent.h>
83
83
#endif
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
 
int drizzled_get_one_option(int, const struct my_option *, char *);
 
379
int drizzled_get_one_option(int, const struct 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);
1252
1252
  {
1253
1253
    int ho_error;
1254
1254
    char **tmp_argv= defaults_argv;
1255
 
    struct my_option no_opts[]=
 
1255
    struct option no_opts[]=
1256
1256
    {
1257
1257
      {0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
1258
1258
    };
1404
1404
};
1405
1405
 
1406
1406
 
1407
 
struct my_option my_long_options[] =
 
1407
struct option my_long_options[] =
1408
1408
{
1409
1409
  {"help", '?', N_("Display this help and exit."),
1410
1410
   (char**) &opt_help, (char**) &opt_help, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0,
1870
1870
}
1871
1871
 
1872
1872
 
1873
 
int drizzled_get_one_option(int optid, const struct my_option *opt,
 
1873
int drizzled_get_one_option(int optid, const struct option *opt,
1874
1874
                             char *argument)
1875
1875
{
1876
1876
  switch(optid) {