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

Proposed by Vlad Lesin
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) Needs Fixing
Review via email: mp+165302@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Alexey Kopytov (akopytov) wrote :

Same problem as in the 2.0 MP.

review: Needs Fixing

Unmerged revisions

599. By Vlad Lesin

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
=== modified file 'patches/innodb56.patch'
--- patches/innodb56.patch 2013-05-17 15:59:05 +0000
+++ patches/innodb56.patch 2013-05-23 08:27:28 +0000
@@ -1150,15 +1150,6 @@
1150 srv_was_started = TRUE;1150 srv_was_started = TRUE;
1151 1151
1152 return(DB_SUCCESS);1152 return(DB_SUCCESS);
1153@@ -2794,7 +2815,7 @@
1154 return(DB_SUCCESS);
1155 }
1156
1157- if (!srv_read_only_mode) {
1158+ if (!srv_read_only_mode && !srv_apply_log_only) {
1159 /* Shutdown the FTS optimize sub system. */
1160 fts_optimize_start_shutdown();
1161
1162--- a/storage/innobase/trx/trx0rseg.cc1153--- a/storage/innobase/trx/trx0rseg.cc
1163+++ b/storage/innobase/trx/trx0rseg.cc1154+++ b/storage/innobase/trx/trx0rseg.cc
1164@@ -121,9 +121,11 @@1155@@ -121,9 +121,11 @@

Subscribers

People subscribed via source and target branches