Merge lp:~hrvojem/percona-xtrabackup/bug919203 into lp:percona-xtrabackup/2.0

Proposed by Hrvoje Matijakovic on 2012-01-23
Status: Merged
Approved by: Alexey Kopytov on 2012-01-23
Approved revision: 382
Merged at revision: 382
Proposed branch: lp:~hrvojem/percona-xtrabackup/bug919203
Merge into: lp:percona-xtrabackup/2.0
Diff against target: 23 lines (+2/-2)
2 files modified
doc/source/faq.rst (+1/-1)
doc/source/innobackupex/incremental_backups_innobackupex.rst (+1/-1)
To merge this branch: bzr merge lp:~hrvojem/percona-xtrabackup/bug919203
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) 2012-01-23 Approve on 2012-01-23
Review via email:
To post a comment you must log in.
Alexey Kopytov (akopytov) wrote :

OK to merge.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'doc/source/faq.rst'
2--- doc/source/faq.rst 2012-01-19 09:47:03 +0000
3+++ doc/source/faq.rst 2012-01-23 07:14:24 +0000
4@@ -56,6 +56,6 @@
5 In most of the cases this is due to not having install the required libraries (and version) by |xtrabackup|. Installing the *GCC* suite with the supporting libraries and recompiling |xtrabackup| will solve the issue. See :doc:`installation/compiling_xtrabackup` for instructions on the procedure.
7 How innobackupex handles the ibdata/ib_log files on restore if they aren't in mysql datadir?
11 In case the ibdata and ib_log files are located in different directories outside of the datadir, you will have to put them in their proper place after the logs have been applied.
13=== modified file 'doc/source/innobackupex/incremental_backups_innobackupex.rst'
14--- doc/source/innobackupex/incremental_backups_innobackupex.rst 2011-07-28 05:29:04 +0000
15+++ doc/source/innobackupex/incremental_backups_innobackupex.rst 2012-01-23 07:14:24 +0000
16@@ -82,7 +82,7 @@
18 Then, the first incremental backup can be applied to the base backup, by issuing: ::
20- innobackupex --apply-log BASE-DIR --incremental-dir=INCREMENTAL-DIR-1
21+ innobackupex --apply-log --redo-only BASE-DIR --incremental-dir=INCREMENTAL-DIR-1
23 You should see an output similar to the previous one but with corresponding |LSN|: ::


People subscribed via source and target branches