Percona XtraBackup moved to https://jira.percona.com/projects/PXB

Merge lp:~sergei.glushchenko/percona-xtrabackup/2.2-xb-bug1273468 into lp:percona-xtrabackup/2.2

  1. 2.2-xb-bug1273468
  2. Merge into 2.2
Proposed by Sergei Glushchenko
Status: Merged
Approved by: Alexey Kopytov
Approved revision: no longer in the source branch.
Merged at revision: 4939
Proposed branch: lp:~sergei.glushchenko/percona-xtrabackup/2.2-xb-bug1273468
Merge into: lp:percona-xtrabackup/2.2
Diff against target: 14 lines (+1/-4)
1 file modified
storage/innobase/trx/trx0trx.cc (+1/-4)
To merge this branch: bzr merge lp:~sergei.glushchenko/percona-xtrabackup/2.2-xb-bug1273468
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) Approve
Review via email: mp+206643@code.launchpad.net

Description of the change

Manual merge from 2.1

http://jenkins.percona.com/view/PXB%202.2/job/percona-xtrabackup-2.2-param/103/

issue #39517

To post a comment you must log in.
Revision history for this message
Alexey Kopytov (akopytov) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'storage/innobase/trx/trx0trx.cc'
2--- storage/innobase/trx/trx0trx.cc 2014-01-16 12:40:18 +0000
3+++ storage/innobase/trx/trx0trx.cc 2014-02-17 00:00:37 +0000
4@@ -592,10 +592,7 @@
5 " was in the XA prepared state.\n", trx->id);
6
7 if (srv_force_recovery == 0) {
8- if (trx_state_eq(trx, TRX_STATE_NOT_STARTED)) {
9- trx_sys->n_prepared_trx++;
10- trx_sys->n_prepared_recovered_trx++;
11- } else {
12+ if (!trx_state_eq(trx, TRX_STATE_NOT_STARTED)) {
13 ut_ad(trx_state_eq(trx, TRX_STATE_PREPARED));
14 }
15

Subscribers

People subscribed via source and target branches