← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/plugin/storage_engine.cc

Merged in some icc warning fixes that also had something to do with the plugin header.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/plugin/storage_engine.cc
100
100
 
101
101
void plugin::StorageEngine::setTransactionReadWrite(Session& session)
102
102
{
103
 
  Ha_trx_info *ha_info= &session.ha_data[getSlot()].ha_info[0];
 
103
  Ha_trx_info *ha_info= session.getEngineInfo(this);
 
104
 
104
105
  /*
105
106
    When a storage engine method is called, the transaction must
106
107
    have been started, unless it's a DDL call, for which the
299
300
  */
300
301
  inline result_type operator() (argument_type engine)
301
302
  {
302
 
    if (engine->is_enabled() && *session_ha_data(session, engine))
 
303
    if (engine->is_enabled() && (*session->getEngineData(engine)))
303
304
      engine->close_connection(session);
304
305
  }
305
306
};