← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/main.cc

  • Committer: Mark Atwood
  • Date: 2011-06-24 11:45:17 UTC
  • mfrom: (2318.6.64 rf)
  • Revision ID: me@mark.atwood.name-20110624114517-1mq8no6jlp2nrg7m
merge lp:~olafvdspek/drizzle/refactor15

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/main.cc
334
334
 
335
335
  try
336
336
  {
337
 
    if (init_server_components(modules))
338
 
      DRIZZLE_ABORT;
 
337
    init_server_components(modules);
339
338
  }
340
339
  catch (abort_exception& ex)
341
340
  {
370
369
  drizzle_rm_tmp_tables();
371
370
  errmsg_printf(error::INFO, _(ER(ER_STARTUP)), internal::my_progname, PANDORA_RELEASE_VERSION, COMPILATION_COMMENT);
372
371
 
373
 
 
374
 
  TransactionServices &transaction_services= TransactionServices::singleton();
375
 
 
376
372
  /* Send server startup event */
377
373
  {
378
374
    Session::shared_ptr session= Session::make_shared(plugin::Listen::getNullClient(), catalog::local());
379
375
    setCurrentSession(session.get());
380
 
    transaction_services.sendStartupEvent(*session);
 
376
    TransactionServices::sendStartupEvent(*session);
381
377
    plugin_startup_window(modules, *session.get());
382
378
  }
383
379
 
402
398
  {
403
399
    Session::shared_ptr session= Session::make_shared(plugin::Listen::getNullClient(), catalog::local());
404
400
    setCurrentSession(session.get());
405
 
    transaction_services.sendShutdownEvent(*session.get());
 
401
    TransactionServices::sendShutdownEvent(*session.get());
406
402
  }
407
403
 
408
404
  {