Merge lp:~akopytov/percona-xtrabackup/bug1366065-2.2 into lp:percona-xtrabackup/2.2

Proposed by Alexey Kopytov
Status: Merged
Approved by: Alexey Kopytov
Approved revision: no longer in the source branch.
Merged at revision: 5047
Proposed branch: lp:~akopytov/percona-xtrabackup/bug1366065-2.2
Merge into: lp:percona-xtrabackup/2.2
Diff against target: 16 lines (+2/-4)
1 file modified
storage/innobase/buf/buf0rea.cc (+2/-4)
To merge this branch: bzr merge lp:~akopytov/percona-xtrabackup/bug1366065-2.2
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) Approve
Review via email: mp+243168@code.launchpad.net
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/buf/buf0rea.cc'
2--- storage/innobase/buf/buf0rea.cc 2014-09-25 12:52:51 +0000
3+++ storage/innobase/buf/buf0rea.cc 2014-11-28 15:51:26 +0000
4@@ -810,11 +810,9 @@
5 if (UNIV_UNLIKELY(err == DB_TABLESPACE_DELETED)) {
6 tablespace_deleted:
7 /* We have deleted or are deleting the single-table
8- tablespace: remove the entries for that page */
9+ tablespace: remove the entries for the tablespace */
10
11- ibuf_merge_or_delete_for_page(NULL, space_ids[i],
12- page_nos[i],
13- zip_size, FALSE);
14+ ibuf_delete_for_discarded_space(space_ids[i]);
15 }
16 }
17

Subscribers

People subscribed via source and target branches

to all changes: