← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/session.cc

Merged up with trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/session.cc
405
405
  if (cleanup_done == false)
406
406
    cleanup();
407
407
 
408
 
  ha_close_connection(this);
 
408
  plugin::StorageEngine::closeConnection(this);
409
409
  plugin_sessionvar_cleanup(this);
410
410
 
411
411
  if (db)
609
609
 
610
610
bool Session::schedule()
611
611
{
612
 
  scheduler= plugin::SchedulerFactory::getScheduler();
 
612
  scheduler= plugin::Scheduler::getScheduler();
 
613
  assert(scheduler);
613
614
 
614
615
  ++connection_count;
615
616
 
852
853
    options|= OPTION_BEGIN;
853
854
    server_status|= SERVER_STATUS_IN_TRANS;
854
855
    if (lex->start_transaction_opt & DRIZZLE_START_TRANS_OPT_WITH_CONS_SNAPSHOT)
855
 
      if (ha_start_consistent_snapshot(this))
 
856
      if (plugin::StorageEngine::startConsistentSnapshot(this))
856
857
        result= false;
857
858
  }
858
859
  return result;