← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/handler.cc

  • Committer: Brian Aker
  • Date: 2009-05-21 00:57:05 UTC
  • mto: This revision was merged to the branch mainline in revision 1032.
  • Revision ID: brian@gaz-20090521005705-rpq4hzhy761d3wbj
Straighten out structures (remove some some dead bits).

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/handler.cc
503
503
  else
504
504
    trans= &session->transaction.stmt;
505
505
 
506
 
  ha_info= session->ha_data[engine->slot].ha_info + static_cast<unsigned>(all);
 
506
  ha_info= session->ha_data[engine->getSlot()].ha_info + static_cast<unsigned>(all);
507
507
 
508
508
  if (ha_info->is_started())
509
509
    return; /* already registered, return */
583
583
 
584
584
    if (! all)
585
585
    {
586
 
      Ha_trx_info *ha_info_all= &session->ha_data[ha_info->engine()->slot].ha_info[1];
 
586
      Ha_trx_info *ha_info_all= &session->ha_data[ha_info->engine()->getSlot()].ha_info[1];
587
587
      assert(ha_info != ha_info_all);
588
588
      /*
589
589
        Merge read-only/read-write information about statement
1974
1974
void
1975
1975
handler::mark_trx_read_write()
1976
1976
{
1977
 
  Ha_trx_info *ha_info= &ha_session()->ha_data[engine->slot].ha_info[0];
 
1977
  Ha_trx_info *ha_info= &ha_session()->ha_data[engine->getSlot()].ha_info[0];
1978
1978
  /*
1979
1979
    When a storage engine method is called, the transaction must
1980
1980
    have been started, unless it's a DDL call, for which the