← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

Merge Paul

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/pbxt/src/ha_pbxt.cc
494
494
        self->st_abort_trans = FALSE;
495
495
        self->st_stat_ended = FALSE;
496
496
        self->st_stat_trans = FALSE;
 
497
        self->st_non_temp_updated = FALSE;
497
498
        XT_PRINT0(self, "xt_xn_begin\n");
498
499
        xt_xres_wait_for_recovery(self, XT_RECOVER_SWEPT);
499
500
}
4628
4629
                                self->st_statistics.st_stat_read++;
4629
4630
                        self->st_stat_modify = FALSE;
4630
4631
                        self->st_import_stat = XT_IMP_NO_IMPORT;
4631
 
 
4632
 
                        /* Only reset this if there is no transactions running, and
4633
 
                         * no tables are open!
4634
 
                         */
4635
 
                        if (!self->st_xact_data)
4636
 
                                self->st_non_temp_opened = FALSE;
4637
4632
                }
4638
4633
 
4639
4634
                if (pb_table_locked) {
4846
4841
#endif
4847
4842
                }
4848
4843
 
4849
 
                /* Any open table can cause this to be FALSE: */
4850
 
                if (!XT_IS_TEMP_TABLE(pb_open_tab->ot_table->tab_dic.dic_tab_flags))
4851
 
                        self->st_non_temp_opened = TRUE;
4852
 
 
4853
4844
                /* Start a statment transaction: */
4854
4845
                /* {START-STAT-HACK} The problem that ha_commit_trans() is not
4855
4846
                 * called by MySQL seems to be fixed (tests confirm this).