← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/session.cc

  • Committer: Monty Taylor
  • Date: 2009-10-06 19:14:39 UTC
  • mfrom: (1130.2.18 plugin-base-class)
  • mto: This revision was merged to the branch mainline in revision 1184.
  • Revision ID: mordred@inaugust.com-20091006191439-fd1vvlp22654l3k3
Merged latest plugin-base-class.

Show diffs side-by-side

added added

removed removed

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