← Back to branch summary

~akopytov/percona-xtrabackup/xtrabackup-1.6-copy-diagnostics

« back to all changes in this revision

Viewing changes to patches/innodb55.patch

  • Committer: Stewart Smith
  • Date: 2012-03-09 00:03:45 UTC
  • mfrom: (328.1.1 1.6)
  • Revision ID: stewart@flamingspork.com-20120309000345-cpk40ju37mvwgray
merge fix for bug#938594: assert on --prepare --apply-log-only

Show diffs side-by-side

added added

removed removed

Lines of Context:
patches/innodb55.patch
1072
1072
 
1073
1073
--- a/storage/innobase/trx/trx0sys.c
1074
1074
+++ b/storage/innobase/trx/trx0sys.c
1075
 
@@ -1686,10 +1686,12 @@
 
1075
@@ -1655,12 +1655,14 @@
 
1076
        mem_free(trx_doublewrite);
 
1077
        trx_doublewrite = NULL;
 
1078
 
 
1079
+       if (!srv_apply_log_only) {
 
1080
        /* Only prepared transactions may be left in the system. Free them. */
 
1081
        ut_a(UT_LIST_GET_LEN(trx_sys->trx_list) == trx_n_prepared);
 
1082
 
 
1083
        while ((trx = UT_LIST_GET_FIRST(trx_sys->trx_list)) != NULL) {
 
1084
                trx_free_prepared(trx);
 
1085
        }
 
1086
+       }
 
1087
 
 
1088
        /* There can't be any active transactions. */
 
1089
        rseg = UT_LIST_GET_FIRST(trx_sys->rseg_list);
 
1090
@@ -1686,10 +1688,12 @@
1076
1091
                UT_LIST_REMOVE(view_list, trx_sys->view_list, prev_view);
1077
1092
        }
1078
1093