Merge lp:~vlad-lesin/percona-xtrabackup/2.1-bug1179193 into lp:percona-xtrabackup/2.1

Proposed by Vlad Lesin on 2013-05-23
Status: Work in progress
Proposed branch: lp:~vlad-lesin/percona-xtrabackup/2.1-bug1179193
Merge into: lp:percona-xtrabackup/2.1
Diff against target: 19 lines (+0/-9)
1 file modified
patches/innodb56.patch (+0/-9)
To merge this branch: bzr merge lp:~vlad-lesin/percona-xtrabackup/2.1-bug1179193
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) 2013-05-23 Needs Fixing on 2013-05-23
Review via email: mp+165302@code.launchpad.net
To post a comment you must log in.
Alexey Kopytov (akopytov) wrote :

Same problem as in the 2.0 MP.

review: Needs Fixing

Unmerged revisions

599. By Vlad Lesin on 2013-05-14

Bug #1179193 fix.

Remove from innodb56.patch fix which disabled invoking
of fts_optimize_start_shutdown() in the case if srv_apply_log_only
is set.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'patches/innodb56.patch'
2--- patches/innodb56.patch 2013-05-17 15:59:05 +0000
3+++ patches/innodb56.patch 2013-05-23 08:27:28 +0000
4@@ -1150,15 +1150,6 @@
5 srv_was_started = TRUE;
6
7 return(DB_SUCCESS);
8-@@ -2794,7 +2815,7 @@
9- return(DB_SUCCESS);
10- }
11-
12-- if (!srv_read_only_mode) {
13-+ if (!srv_read_only_mode && !srv_apply_log_only) {
14- /* Shutdown the FTS optimize sub system. */
15- fts_optimize_start_shutdown();
16-
17 --- a/storage/innobase/trx/trx0rseg.cc
18 +++ b/storage/innobase/trx/trx0rseg.cc
19 @@ -121,9 +121,11 @@

Subscribers

People subscribed via source and target branches