← Back to branch summary

~akopytov/percona-xtrabackup/bug1002688-2.1

« back to all changes in this revision

Viewing changes to patches/innodb55.patch

  • Committer: Alexey Kopytov
  • Date: 2012-05-14 15:31:43 UTC
  • mfrom: (391.1.33 staging)
  • Revision ID: akopytov@gmail.com-20120514153143-i06vj6orpdwh9qb8
Manual merge from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
patches/innodb55.patch
1101
1101
 
1102
1102
--- a/storage/innobase/trx/trx0sys.c
1103
1103
+++ b/storage/innobase/trx/trx0sys.c
1104
 
@@ -1686,10 +1686,12 @@
 
1104
@@ -1655,12 +1655,14 @@
 
1105
        mem_free(trx_doublewrite);
 
1106
        trx_doublewrite = NULL;
 
1107
 
 
1108
+       if (!srv_apply_log_only) {
 
1109
        /* Only prepared transactions may be left in the system. Free them. */
 
1110
        ut_a(UT_LIST_GET_LEN(trx_sys->trx_list) == trx_n_prepared);
 
1111
 
 
1112
        while ((trx = UT_LIST_GET_FIRST(trx_sys->trx_list)) != NULL) {
 
1113
                trx_free_prepared(trx);
 
1114
        }
 
1115
+       }
 
1116
 
 
1117
        /* There can't be any active transactions. */
 
1118
        rseg = UT_LIST_GET_FIRST(trx_sys->rseg_list);
 
1119
@@ -1686,10 +1688,12 @@
1105
1120
                UT_LIST_REMOVE(view_list, trx_sys->view_list, prev_view);
1106
1121
        }
1107
1122