← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

  • Committer: Lee Bieber
  • Date: 2011-01-21 21:44:29 UTC
  • mfrom: (2100.1.6 build)
  • Revision ID: kalebral@gmail.com-20110121214429-p7ctkpx00hsb6pv7
Update test for regression.682563 to add now needed COMMIT statements
Need to add new doc files to docs/include.am for distcheck target
update big test, add COMMIT statement per Stewart's recent changes
Merge Stewart - fix bug 701468: TransactionalStorageEngine::doRollback(session, all) "all" isn't true - need to check session autocommit settings
Merge Stewart - 682563: TransactionalStorageEngine::doCommit(session, all) "all" isn't true - need to check session autocommit settings
Merge Andrew - fix bug 705576: Docs need 'How to compile' pages
Merge Andrew - fix bug 705771: Documentation for common client errors

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/pbxt/src/ha_pbxt.cc
5723
5723
        return xt_ha_pbxt_thread_error_for_mysql(thd, xt_ha_thd_to_self(thd), false);
5724
5724
}
5725
5725
 
5726
 
int PBXTStorageEngine::doCommit(drizzled::Session* thd, bool)
 
5726
int PBXTStorageEngine::doCommit(drizzled::Session* thd, bool real_commit)
5727
5727
{
5728
5728
        int err = 0;
5729
5729
        XTThreadPtr self = (XTThreadPtr) *thd->getEngineData(pbxt_hton);
5730
5730
 
5731
 
        bool real_commit = !session_test_options(thd, OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN);
5732
 
        
5733
5731
        XT_PRINT1(self, "PBXTStorageEngine::doCommit(real_commit = %s)\n", real_commit ? "true" : "false");
5734
5732
 
5735
5733
        if (real_commit && self) {
5740
5738
        return err;
5741
5739
}
5742
5740
 
5743
 
int PBXTStorageEngine::doRollback(drizzled::Session* thd, bool)
 
5741
int PBXTStorageEngine::doRollback(drizzled::Session* thd, bool real_commit)
5744
5742
{
5745
5743
        int err = 0;
5746
5744
        XTThreadPtr self = (XTThreadPtr) *thd->getEngineData(pbxt_hton);
5747
5745
 
5748
 
        bool real_commit = !session_test_options(thd, OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN);
5749
 
 
5750
5746
        XT_PRINT1(self, "PBXTStorageEngine::doRollback(real_commit = %s)\n", real_commit ? "true" : "false");
5751
5747
 
5752
5748
        if (real_commit && self) {