← 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-01-23 02:15:04 UTC
  • mfrom: (798.2.32 drizzle)
  • Revision ID: brian@tangent.org-20090123021504-2j99e6hxab1ew601
Merge for replication removal.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/handler.cc
680
680
  Session_TRANS *trans= all ? &session->transaction.all : &session->transaction.stmt;
681
681
  bool is_real_trans= all || session->transaction.all.ha_list == 0;
682
682
  Ha_trx_info *ha_info= trans->ha_list;
683
 
  my_xid xid= session->transaction.xid_state.xid.get_my_xid();
684
683
 
685
684
  /*
686
685
    We must not commit the normal transaction if a statement
727
726
        }
728
727
        status_var_increment(session->status_var.ha_prepare_count);
729
728
      }
730
 
      if (error || (is_real_trans && xid &&
731
 
                    (error= !(cookie= tc_log->log_xid(session, xid)))))
 
729
      if (error)
732
730
      {
733
731
        ha_rollback_trans(session, all);
734
732
        error= 1;
736
734
      }
737
735
    }
738
736
    error=ha_commit_one_phase(session, all) ? (cookie ? 2 : 1) : 0;
739
 
    if (cookie)
740
 
      tc_log->unlog(cookie, xid);
741
737
end:
742
738
    if (is_real_trans)
743
739
      start_waiting_global_read_lock(session);