Merge lp:~hrvojem/percona-xtrabackup/doc-116-2.1 into lp:percona-xtrabackup/2.1

Proposed by Hrvoje Matijakovic on 2014-12-17
Status: Merged
Approved by: Alexey Kopytov on 2014-12-17
Approved revision: 770
Merged at revision: 770
Proposed branch: lp:~hrvojem/percona-xtrabackup/doc-116-2.1
Merge into: lp:percona-xtrabackup/2.1
Diff against target: 181 lines (+16/-17)
13 files modified
doc/source/conf.py (+2/-3)
doc/source/howtos/recipes_ibkx_compressed.rst (+1/-1)
doc/source/howtos/setting_up_replication.rst (+2/-2)
doc/source/index.rst (+2/-2)
doc/source/innobackupex/innobackupex_option_reference.rst (+1/-1)
doc/source/intro.rst (+1/-1)
doc/source/release-notes/1.6/1.6.4.rst (+1/-1)
doc/source/release-notes/2.0/2.0.7.rst (+1/-1)
doc/source/release-notes/2.1/2.1.0-alpha1.rst (+1/-1)
doc/source/release-notes/2.1/2.1.1.rst (+1/-1)
doc/source/release-notes/2.1/2.1.3.rst (+1/-1)
doc/source/xtrabackup_bin/lru_dump.rst (+1/-1)
doc/source/xtrabackup_bin/xbk_option_reference.rst (+1/-1)
To merge this branch: bzr merge lp:~hrvojem/percona-xtrabackup/doc-116-2.1
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) 2014-12-17 Approve on 2014-12-17
Review via email: mp+244965@code.launchpad.net
To post a comment you must log in.
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 'doc/source/conf.py'
2--- doc/source/conf.py 2014-09-25 07:32:11 +0000
3+++ doc/source/conf.py 2014-12-17 10:54:04 +0000
4@@ -26,9 +26,8 @@
5 # Add any Sphinx extension module names here, as strings. They can be extensions
6 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
7
8-extensions = ['sphinx.ext.intersphinx', 'sphinx.ext.todo',
9- 'sphinx.ext.coverage', 'sphinx.ext.ifconfig',
10- 'sphinx.ext.extlinks']
11+extensions = ['sphinx.ext.extlinks', 'sphinx.ext.todo',
12+ 'sphinx.ext.coverage', 'sphinx.ext.ifconfig']
13
14 # Add any paths that contain templates here, relative to this directory.
15 templates_path = ['_templates']
16
17=== modified file 'doc/source/howtos/recipes_ibkx_compressed.rst'
18--- doc/source/howtos/recipes_ibkx_compressed.rst 2013-08-01 08:54:47 +0000
19+++ doc/source/howtos/recipes_ibkx_compressed.rst 2014-12-17 10:54:04 +0000
20@@ -30,7 +30,7 @@
21
22 $ for bf in `find . -iname "*\.qp"`; do qpress -d $bf $(dirname $bf) && rm $bf; done
23
24-In |Percona Xtrabackup| 2.1.4 new :option:`innobackupex --decompress` option has been implemented that can be used to decompress the backup: ::
25+In |Percona XtraBackup| 2.1.4 new :option:`innobackupex --decompress` option has been implemented that can be used to decompress the backup: ::
26
27 $ innobackupex --decompress /data/backup/2013-08-01_11-24-04/
28
29
30=== modified file 'doc/source/howtos/setting_up_replication.rst'
31--- doc/source/howtos/setting_up_replication.rst 2014-09-25 07:32:11 +0000
32+++ doc/source/howtos/setting_up_replication.rst 2014-12-17 10:54:04 +0000
33@@ -80,7 +80,7 @@
34
35 .. code-block:: console
36
37- TheMaster$ rsync -avprP -e ssh /path/to/backupdir/$TIMESTAMP TheSlave:/path/to/mysql/
38+ TheMaster$ rsync -avpP -e ssh /path/to/backupdir/$TIMESTAMP TheSlave:/path/to/mysql/
39
40 After data has been copied you can back up the original or previously installed |MySQL| :term:`datadir` (**NOTE**: Make sure mysqld is shut down before you move the contents of its datadir, or move the snapshot into its datadir.):
41
42@@ -193,7 +193,7 @@
43
44 .. code-block:: console
45
46- TheSlave$ innobackupex --user=yourDBuser --password=MaGiCiGaM /
47+ TheSlave$ innobackupex --user=yourDBuser --password=MaGiCiGaM \
48 --slave-info /path/to/backupdir
49
50 By using the :option:`--slave-info` |Percona XtraBackup| creates additional file called :file:`xtrabackup_slave_info`.
51
52=== modified file 'doc/source/index.rst'
53--- doc/source/index.rst 2014-09-25 07:32:11 +0000
54+++ doc/source/index.rst 2014-12-17 10:54:04 +0000
55@@ -1,10 +1,10 @@
56-.. Percona Xtrabackup documentation master file, created by
57+.. Percona XtraBackup documentation master file, created by
58 sphinx-quickstart on Fri May 6 01:04:39 2011.
59 You can adapt this file completely to your liking, but it should at least
60 contain the root `toctree` directive.
61
62 ====================================
63- Percona Xtrabackup - Documentation
64+ Percona XtraBackup - Documentation
65 ====================================
66
67 |Percona XtraBackup| is an open-source hot backup utility for |MySQL| - based servers that doesn't lock your database during the backup.
68
69=== modified file 'doc/source/innobackupex/innobackupex_option_reference.rst'
70--- doc/source/innobackupex/innobackupex_option_reference.rst 2014-09-25 07:32:11 +0000
71+++ doc/source/innobackupex/innobackupex_option_reference.rst 2014-12-17 10:54:04 +0000
72@@ -16,7 +16,7 @@
73
74 .. option:: --close-files
75
76- Do not keep files opened. This option is passed directly to xtrabackup. When xtrabackup opens tablespace it normally doesn't close its file handle in order to handle the DDL operations correctly. However, if the number of tablespaces is really huge and can not fit into any limit, there is an option to close file handles once they are no longer accessed. Xtrabackup can produce inconsistent backups with this option enabled. Use at your own risk.
77+ Do not keep files opened. This option is passed directly to xtrabackup. When xtrabackup opens tablespace it normally doesn't close its file handle in order to handle the DDL operations correctly. However, if the number of tablespaces is really huge and can not fit into any limit, there is an option to close file handles once they are no longer accessed. |Percona XtraBackup| can produce inconsistent backups with this option enabled. Use at your own risk.
78
79 .. option:: --compact
80
81
82=== modified file 'doc/source/intro.rst'
83--- doc/source/intro.rst 2014-06-04 07:39:21 +0000
84+++ doc/source/intro.rst 2014-12-17 10:54:04 +0000
85@@ -1,5 +1,5 @@
86 ==========================
87- About Percona Xtrabackup
88+ About Percona XtraBackup
89 ==========================
90
91
92
93=== modified file 'doc/source/release-notes/1.6/1.6.4.rst'
94--- doc/source/release-notes/1.6/1.6.4.rst 2013-08-30 08:52:03 +0000
95+++ doc/source/release-notes/1.6/1.6.4.rst 2014-12-17 10:54:04 +0000
96@@ -4,7 +4,7 @@
97
98 Percona is glad to announce the release of Percona XtraBackup 1.6.4 on 19 December, 2011 (Downloads are available `here <http://www.percona.com/downloads/XtraBackup/XtraBackup-1.6.4/>`_ and from the :doc:`Percona Software Repositories </installation>`).
99
100-This release is purely composed of bug fixes and is the current stable release of |Percona| |Xtrabackup|.
101+This release is purely composed of bug fixes and is the current stable release of |Percona| |XtraBackup|.
102
103 In this release we now compile the |xtrabackup| binary against more recent MySQL and Percona Server versions. We now build against: MySQL 5.1.59, MySQL 5.5.17, Percona Server 5.1.59-13.0 and Percona Server 5.5.16-22.0 and get all the InnoDB bug fixes each of these releases contain. Using `xtrabackup` to back up older MySQL or Percona Server releases is still supported.
104
105
106=== modified file 'doc/source/release-notes/2.0/2.0.7.rst'
107--- doc/source/release-notes/2.0/2.0.7.rst 2013-08-30 08:52:03 +0000
108+++ doc/source/release-notes/2.0/2.0.7.rst 2014-12-17 10:54:04 +0000
109@@ -34,7 +34,7 @@
110
111 Fixed couple of warnings found in |innobackupex| when all warnings have been made ``FATAL``. Bug fixed :bug:`1116177`.
112
113- If there are thousands of tables and slow IO then |Xtrabackup| can spend a lot of time opening all the tablespaces. Optimization has been implemented and |Percona XtraBackup| now avoids loading non-relevant tablespaces when partial backup is being taken which speeds up the backup process. Bug fixed :bug:`1130145`.
114+ If there are thousands of tables and slow IO then |xtrabackup| can spend a lot of time opening all the tablespaces. Optimization has been implemented and |Percona XtraBackup| now avoids loading non-relevant tablespaces when partial backup is being taken which speeds up the backup process. Bug fixed :bug:`1130145`.
115
116 |Percona XtraBackup| didn't initialize per-thread data in the log copying thread which could cause |Percona XtraBackup| to crash. Bug fixed :bug:`1166888`.
117
118
119=== modified file 'doc/source/release-notes/2.1/2.1.0-alpha1.rst'
120--- doc/source/release-notes/2.1/2.1.0-alpha1.rst 2013-05-10 09:29:17 +0000
121+++ doc/source/release-notes/2.1/2.1.0-alpha1.rst 2014-12-17 10:54:04 +0000
122@@ -11,7 +11,7 @@
123 New features
124 ------------
125
126- |Percona Xtrabackup| now has support for :ref:`compact_backups_ibk`. This feature can be used for taking the backups that will take less amount of disk space.
127+ |Percona XtraBackup| now has support for :ref:`compact_backups_ibk`. This feature can be used for taking the backups that will take less amount of disk space.
128
129 |Percona XtraBackup| has implemented :ref:`encrypted_backups_ibk`. This feature can be used to encrypt/decrypt both local and streamed backups in order to add another layer of protection to the backups.
130
131
132=== modified file 'doc/source/release-notes/2.1/2.1.1.rst'
133--- doc/source/release-notes/2.1/2.1.1.rst 2013-05-14 06:09:45 +0000
134+++ doc/source/release-notes/2.1/2.1.1.rst 2014-12-17 10:54:04 +0000
135@@ -9,7 +9,7 @@
136 New features
137 ------------
138
139- |Percona Xtrabackup| now has support for :ref:`compact_backups_ibk`. This feature can be used for taking the backups that will take less amount of disk space. GA release now contains new :option:`innobackupex --rebuild-threads` that can be used to specify the number of threads started by XtraBackup when rebuilding secondary indexes on ``innobackupex --apply-log --rebuild-indexes``. This allows parallel processing of individual tables when rebuilding the index.
140+ |Percona XtraBackup| now has support for :ref:`compact_backups_ibk`. This feature can be used for taking the backups that will take less amount of disk space. GA release now contains new :option:`innobackupex --rebuild-threads` that can be used to specify the number of threads started by XtraBackup when rebuilding secondary indexes on ``innobackupex --apply-log --rebuild-indexes``. This allows parallel processing of individual tables when rebuilding the index.
141
142 |Percona XtraBackup| has implemented :ref:`encrypted_backups_ibk`. This feature can be used to encrypt/decrypt both local and streamed backups in order to add another layer of protection to the backups.
143
144
145=== modified file 'doc/source/release-notes/2.1/2.1.3.rst'
146--- doc/source/release-notes/2.1/2.1.3.rst 2013-05-22 11:21:52 +0000
147+++ doc/source/release-notes/2.1/2.1.3.rst 2014-12-17 10:54:04 +0000
148@@ -4,7 +4,7 @@
149
150 Percona is glad to announce the release of |Percona XtraBackup| 2.1.3 on May 22nd 2013. Downloads are available from our download site `here <http://www.percona.com/downloads/XtraBackup/XtraBackup-2.1.3/>`_ and :doc:`Percona Software Repositories </installation>`.
151
152-This release fixes a high priority bug. It's advised to upgrade your latest 2.1 version to 2.1.3 if you're using the |Percona Xtrabackup| with |Percona XtraDB Cluster|. This release is the latest stable release in the 2.1 series.
153+This release fixes a high priority bug. It's advised to upgrade your latest 2.1 version to 2.1.3 if you're using the |Percona XtraBackup| with |Percona XtraDB Cluster|. This release is the latest stable release in the 2.1 series.
154
155 Bugs Fixed
156 ----------
157
158=== modified file 'doc/source/xtrabackup_bin/lru_dump.rst'
159--- doc/source/xtrabackup_bin/lru_dump.rst 2013-08-30 09:55:04 +0000
160+++ doc/source/xtrabackup_bin/lru_dump.rst 2014-12-17 10:54:04 +0000
161@@ -2,7 +2,7 @@
162 LRU dump backup
163 ================
164
165-This feature reduces the warm up time by restoring buffer pool state from :file:`ib_lru_dump` file after restart. |Percona Xtrabackup| discovers :file:`ib_lru_dump` and backs it up automatically.
166+This feature reduces the warm up time by restoring buffer pool state from :file:`ib_lru_dump` file after restart. |Percona XtraBackup| discovers :file:`ib_lru_dump` and backs it up automatically.
167
168 .. image:: /_static/lru_dump.png
169
170
171=== modified file 'doc/source/xtrabackup_bin/xbk_option_reference.rst'
172--- doc/source/xtrabackup_bin/xbk_option_reference.rst 2014-09-10 11:21:05 +0000
173+++ doc/source/xtrabackup_bin/xbk_option_reference.rst 2014-12-17 10:54:04 +0000
174@@ -19,7 +19,7 @@
175
176 .. option:: --close-files
177
178- Do not keep files opened. When xtrabackup opens tablespace it normally doesn't close its file handle in order to handle the DDL operations correctly. However, if the number of tablespaces is really huge and can not fit into any limit, there is an option to close file handles once they are no longer accessed. Xtrabackup can produce inconsistent backups with this option enabled. Use at your own risk.
179+ Do not keep files opened. When xtrabackup opens tablespace it normally doesn't close its file handle in order to handle the DDL operations correctly. However, if the number of tablespaces is really huge and can not fit into any limit, there is an option to close file handles once they are no longer accessed. |Percona XtraBackup| can produce inconsistent backups with this option enabled. Use at your own risk.
180
181 .. option:: --compact
182

Subscribers

People subscribed via source and target branches