← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/cursor.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/cursor.cc
150
150
 
151
151
void **Cursor::ha_data(Session *session) const
152
152
{
153
 
  return session_ha_data(session, engine);
 
153
  return session->getEngineData(engine);
154
154
}
155
155
 
156
156
Session *Cursor::ha_session(void) const
683
683
void
684
684
Cursor::mark_trx_read_write()
685
685
{
686
 
  Ha_trx_info *ha_info= &ha_session()->ha_data[engine->getSlot()].ha_info[0];
 
686
  Ha_trx_info *ha_info= ha_session()->getEngineInfo(engine);
687
687
  /*
688
688
    When a storage engine method is called, the transaction must
689
689
    have been started, unless it's a DDL call, for which the