← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/drizzled.cc

Merged in plugin-slot-reorg patches.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
39
39
#include <drizzled/session.h>
40
40
#include <drizzled/db.h>
41
41
#include <drizzled/item/create.h>
42
 
#include <drizzled/errmsg.h>
43
42
#include <drizzled/unireg.h>
44
 
#include <drizzled/scheduling.h>
45
43
#include "drizzled/temporal_format.h" /* For init_temporal_formats() */
46
44
#include "drizzled/slot/listen.h"
 
45
#include "drizzled/slot/error_message.h"
47
46
 
48
47
#include <google/protobuf/stubs/common.h>
49
48
 
1392
1391
    scheduler_name= opt_scheduler_default;
1393
1392
  }
1394
1393
 
1395
 
  if (set_scheduler_factory(scheduler_name))
 
1394
  if (plugins.scheduler.setFactory(scheduler_name))
1396
1395
  {
1397
1396
      errmsg_printf(ERRMSG_LVL_ERROR,
1398
1397
                   _("No scheduler found, cannot continue!\n"));
2404
2403
 
2405
2404
void option_error_reporter(enum loglevel level, const char *format, ...)
2406
2405
{
 
2406
  plugin::Registry &plugins= plugin::Registry::singleton();
 
2407
 
2407
2408
  va_list args;
2408
2409
  va_start(args, format);
2409
2410
 
2410
2411
  /* Don't print warnings for --loose options during bootstrap */
2411
2412
  if (level == ERROR_LEVEL || global_system_variables.log_warnings)
2412
2413
  {
2413
 
    errmsg_vprintf (current_session, ERROR_LEVEL, format, args);
 
2414
    plugins.error_message.vprintf(current_session, ERROR_LEVEL, format, args);
2414
2415
  }
2415
2416
  va_end(args);
2416
2417
}