← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/ha_commands.cc

  • Committer: Monty Taylor
  • Date: 2009-12-08 22:24:26 UTC
  • mto: (1241.9.9 out-of-tree)
  • mto: This revision was merged to the branch mainline in revision 1250.
  • Revision ID: mordred@inaugust.com-20091208222426-rtv7e9vrvw5g8h1s
Removed some casts- also removed a few c-interface functions and made them actual methods on session. Also made the ha_data private. (fancy that)

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/ha_commands.cc
502
502
  else
503
503
    trans= &session->transaction.stmt;
504
504
 
505
 
  ha_info= session->ha_data[engine->getSlot()].ha_info + static_cast<unsigned>(all);
 
505
  ha_info= session->getEngineInfo(engine, all ? 1 : 0);
506
506
 
507
507
  if (ha_info->is_started())
508
508
    return; /* already registered, return */
544
544
 
545
545
    if (! all)
546
546
    {
547
 
      Ha_trx_info *ha_info_all= &session->ha_data[ha_info->engine()->getSlot()].ha_info[1];
 
547
      Ha_trx_info *ha_info_all= session->getEngineInfo(ha_info->engine(), 1);
548
548
      assert(ha_info != ha_info_all);
549
549
      /*
550
550
        Merge read-only/read-write information about statement