← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/drizzled.cc

  • Committer: Jay Pipes
  • Date: 2010-04-08 16:27:25 UTC
  • mfrom: (1405.6.10 replication-pairs)
  • mto: This revision was merged to the branch mainline in revision 1457.
  • Revision ID: jpipes@serialcoder-20100408162725-sugbgn38oxjqclq2
Merge trunk and replication-pairs with conflict resolution

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
49
49
#include "drizzled/plugin/scheduler.h"
50
50
#include "drizzled/plugin/xa_resource_manager.h"
51
51
#include "drizzled/plugin/monitored_in_transaction.h"
 
52
#include "drizzled/replication_services.h" /* For ReplicationServices::evaluateRegisteredPlugins() */
52
53
#include "drizzled/probes.h"
53
54
#include "drizzled/session_list.h"
54
55
#include "drizzled/charset.h"
77
78
 
78
79
#include <errno.h>
79
80
#include <sys/stat.h>
80
 
#include "drizzled/my_getopt.h"
 
81
#include "drizzled/option.h"
81
82
#ifdef HAVE_SYSENT_H
82
83
#include <sysent.h>
83
84
#endif
373
374
extern "C" pthread_handler_t signal_hand(void *arg);
374
375
static void drizzle_init_variables(void);
375
376
static void get_options(int *argc,char **argv);
376
 
int drizzled_get_one_option(int, const struct my_option *, char *);
 
377
int drizzled_get_one_option(int, const struct option *, char *);
377
378
static int init_thread_environment();
378
379
static const char *get_relative_path(const char *path);
379
380
static void fix_paths(string &progname);
1249
1250
  {
1250
1251
    int ho_error;
1251
1252
    char **tmp_argv= defaults_argv;
1252
 
    struct my_option no_opts[]=
 
1253
    struct option no_opts[]=
1253
1254
    {
1254
1255
      {0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
1255
1256
    };
1401
1402
};
1402
1403
 
1403
1404
 
1404
 
struct my_option my_long_options[] =
 
1405
struct option my_long_options[] =
1405
1406
{
1406
1407
  {"help", '?', N_("Display this help and exit."),
1407
1408
   (char**) &opt_help, (char**) &opt_help, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0,
1861
1862
}
1862
1863
 
1863
1864
 
1864
 
int drizzled_get_one_option(int optid, const struct my_option *opt,
 
1865
int drizzled_get_one_option(int optid, const struct option *opt,
1865
1866
                             char *argument)
1866
1867
{
1867
1868
  switch(optid) {
2299
2300
  if (init_server_components(plugins))
2300
2301
    unireg_abort(1);
2301
2302
 
 
2303
  /**
 
2304
   * This check must be done after init_server_components for now
 
2305
   * because we don't yet have plugin dependency tracking...
 
2306
   *
 
2307
   * ReplicationServices::evaluateRegisteredPlugins() will print error messages to stderr
 
2308
   * via errmsg_printf().
 
2309
   *
 
2310
   * @todo
 
2311
   *
 
2312
   * not checking return since unireg_abort() hangs
 
2313
   */
 
2314
  ReplicationServices &replication_services= ReplicationServices::singleton();
 
2315
  (void) replication_services.evaluateRegisteredPlugins();
 
2316
 
2302
2317
  if (plugin::Listen::setup())
2303
2318
    unireg_abort(1);
2304
2319