← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

  • Committer: lbieber
  • Date: 2010-09-22 13:48:54 UTC
  • mfrom: (1784.1.3 build)
  • Revision ID: lbieber@orisndriz08-20100922134854-y7mae2taqhn73vsx
Merge Paul M. - latest changes from PBXT 1.0.11-7
Merge Paul M. - fix bug 641038 - pbxt rollback not working (tables reported as non-transactional)
Merge Andrew - fix show stoppers for new drizzledump

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/pbxt/src/xaction_xt.cc
1459
1459
                 * Because we are only here because the record was valid but not
1460
1460
                 * clean (you can confirm this by looking at the code that
1461
1461
                 * calls this function).
 
1462
                 *
 
1463
                 * See {RETRY-READ}
1462
1464
                 */
1463
1465
                return XT_XN_REREAD;
1464
1466
        }
1644
1646
                        }
1645
1647
                        else {
1646
1648
                                xn_log_id = x_log_id;
1647
 
                                x_log_offset = x_log_offset;
 
1649
                                xn_log_offset = x_log_offset;
1648
1650
                        }
1649
1651
                }
1650
1652
                xn_id++;