← Back to branch summary

~skinny.moey/drizzle/transaction_id_innodb

« back to all changes in this revision

Viewing changes to plugin/pbxt/src/ha_pbxt.cc

  • Committer: Joseph Daly
  • Date: 2010-10-30 01:01:48 UTC
  • mfrom: (1856.2.35 staging)
  • Revision ID: skinny.moey@gmail.com-20101030010148-k39lnrftv4bkbux9
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/pbxt/src/ha_pbxt.cc
5700
5700
        if (!self->st_database)
5701
5701
                xt_ha_open_database_of_table(self, NULL);
5702
5702
 
5703
 
        /* startTransaction() calls registerResourceForTransaction() calls engine->startTransaction(), and then
5704
 
         * startTransaction() calls doStartTransaction()
5705
 
         * Which leads to this function being called twice!?
5706
 
         * So added the self->st_xact_data test below.
5707
 
         */
5708
 
        if (!self->st_xact_data) {
5709
 
                if (!xt_xn_begin(self)) {
5710
 
                        err = xt_ha_pbxt_thread_error_for_mysql(thd, self, /*pb_ignore_dup_key*/false);
5711
 
                        //pb_ex_in_use = 0;
5712
 
                }
 
5703
        assert(!self->st_xact_data); // Check we're not called twice
 
5704
        if (!xt_xn_begin(self)) {
 
5705
          err = xt_ha_pbxt_thread_error_for_mysql(thd, self, /*pb_ignore_dup_key*/false);
5713
5706
        }
5714
5707
 
5715
5708
        return err;