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

Proposed by Hrvoje Matijakovic on 2014-12-17
Status: Merged
Approved by: Alexey Kopytov on 2014-12-17
Approved revision: no longer in the source branch.
Merged at revision: 5055
Proposed branch: lp:~hrvojem/percona-xtrabackup/doc-116-2.2
Merge into: lp:percona-xtrabackup/2.2
Diff against target: 164 lines (+14/-15)
12 files modified
storage/innobase/xtrabackup/doc/source/conf.py (+2/-3)
storage/innobase/xtrabackup/doc/source/howtos/recipes_ibkx_compressed.rst (+1/-1)
storage/innobase/xtrabackup/doc/source/howtos/setting_up_replication.rst (+2/-2)
storage/innobase/xtrabackup/doc/source/innobackupex/innobackupex_option_reference.rst (+1/-1)
storage/innobase/xtrabackup/doc/source/intro.rst (+1/-1)
storage/innobase/xtrabackup/doc/source/release-notes/1.6/1.6.4.rst (+1/-1)
storage/innobase/xtrabackup/doc/source/release-notes/2.0/2.0.7.rst (+1/-1)
storage/innobase/xtrabackup/doc/source/release-notes/2.1/2.1.0-alpha1.rst (+1/-1)
storage/innobase/xtrabackup/doc/source/release-notes/2.1/2.1.1.rst (+1/-1)
storage/innobase/xtrabackup/doc/source/release-notes/2.1/2.1.3.rst (+1/-1)
storage/innobase/xtrabackup/doc/source/xtrabackup_bin/lru_dump.rst (+1/-1)
storage/innobase/xtrabackup/doc/source/xtrabackup_bin/xbk_option_reference.rst (+1/-1)
To merge this branch: bzr merge lp:~hrvojem/percona-xtrabackup/doc-116-2.2
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) 2014-12-17 Approve on 2014-12-17
Review via email: mp+244967@code.launchpad.net
To post a comment you must log in.
Alexey Kopytov (akopytov) :
review: Approve
5055. By Hrvoje Matijakovic on 2014-12-18

* automerge of 2.1 branch (fixes BLD-170, BLD-116, BLD-123)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'storage/innobase/xtrabackup/doc/source/conf.py'
2--- storage/innobase/xtrabackup/doc/source/conf.py 2014-12-08 19:36:28 +0000
3+++ storage/innobase/xtrabackup/doc/source/conf.py 2014-12-18 10:41:50 +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 'storage/innobase/xtrabackup/doc/source/howtos/recipes_ibkx_compressed.rst'
18--- storage/innobase/xtrabackup/doc/source/howtos/recipes_ibkx_compressed.rst 2013-08-01 08:54:47 +0000
19+++ storage/innobase/xtrabackup/doc/source/howtos/recipes_ibkx_compressed.rst 2014-12-18 10:41:50 +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 'storage/innobase/xtrabackup/doc/source/howtos/setting_up_replication.rst'
31--- storage/innobase/xtrabackup/doc/source/howtos/setting_up_replication.rst 2014-09-25 07:32:11 +0000
32+++ storage/innobase/xtrabackup/doc/source/howtos/setting_up_replication.rst 2014-12-18 10:41:50 +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 'storage/innobase/xtrabackup/doc/source/innobackupex/innobackupex_option_reference.rst'
53--- storage/innobase/xtrabackup/doc/source/innobackupex/innobackupex_option_reference.rst 2014-09-25 16:10:20 +0000
54+++ storage/innobase/xtrabackup/doc/source/innobackupex/innobackupex_option_reference.rst 2014-12-18 10:41:50 +0000
55@@ -16,7 +16,7 @@
56
57 .. option:: --close-files
58
59- 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.
60+ 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.
61
62 .. option:: --compact
63
64
65=== modified file 'storage/innobase/xtrabackup/doc/source/intro.rst'
66--- storage/innobase/xtrabackup/doc/source/intro.rst 2014-09-14 09:28:19 +0000
67+++ storage/innobase/xtrabackup/doc/source/intro.rst 2014-12-18 10:41:50 +0000
68@@ -1,5 +1,5 @@
69 ==========================
70- About Percona Xtrabackup
71+ About Percona XtraBackup
72 ==========================
73
74
75
76=== modified file 'storage/innobase/xtrabackup/doc/source/release-notes/1.6/1.6.4.rst'
77--- storage/innobase/xtrabackup/doc/source/release-notes/1.6/1.6.4.rst 2013-08-30 08:52:03 +0000
78+++ storage/innobase/xtrabackup/doc/source/release-notes/1.6/1.6.4.rst 2014-12-18 10:41:50 +0000
79@@ -4,7 +4,7 @@
80
81 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>`).
82
83-This release is purely composed of bug fixes and is the current stable release of |Percona| |Xtrabackup|.
84+This release is purely composed of bug fixes and is the current stable release of |Percona| |XtraBackup|.
85
86 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.
87
88
89=== modified file 'storage/innobase/xtrabackup/doc/source/release-notes/2.0/2.0.7.rst'
90--- storage/innobase/xtrabackup/doc/source/release-notes/2.0/2.0.7.rst 2013-08-30 08:52:03 +0000
91+++ storage/innobase/xtrabackup/doc/source/release-notes/2.0/2.0.7.rst 2014-12-18 10:41:50 +0000
92@@ -34,7 +34,7 @@
93
94 Fixed couple of warnings found in |innobackupex| when all warnings have been made ``FATAL``. Bug fixed :bug:`1116177`.
95
96- 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`.
97+ 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`.
98
99 |Percona XtraBackup| didn't initialize per-thread data in the log copying thread which could cause |Percona XtraBackup| to crash. Bug fixed :bug:`1166888`.
100
101
102=== modified file 'storage/innobase/xtrabackup/doc/source/release-notes/2.1/2.1.0-alpha1.rst'
103--- storage/innobase/xtrabackup/doc/source/release-notes/2.1/2.1.0-alpha1.rst 2013-05-10 09:29:17 +0000
104+++ storage/innobase/xtrabackup/doc/source/release-notes/2.1/2.1.0-alpha1.rst 2014-12-18 10:41:50 +0000
105@@ -11,7 +11,7 @@
106 New features
107 ------------
108
109- |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.
110+ |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.
111
112 |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.
113
114
115=== modified file 'storage/innobase/xtrabackup/doc/source/release-notes/2.1/2.1.1.rst'
116--- storage/innobase/xtrabackup/doc/source/release-notes/2.1/2.1.1.rst 2013-05-14 06:09:45 +0000
117+++ storage/innobase/xtrabackup/doc/source/release-notes/2.1/2.1.1.rst 2014-12-18 10:41:50 +0000
118@@ -9,7 +9,7 @@
119 New features
120 ------------
121
122- |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.
123+ |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.
124
125 |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.
126
127
128=== modified file 'storage/innobase/xtrabackup/doc/source/release-notes/2.1/2.1.3.rst'
129--- storage/innobase/xtrabackup/doc/source/release-notes/2.1/2.1.3.rst 2013-05-22 11:21:52 +0000
130+++ storage/innobase/xtrabackup/doc/source/release-notes/2.1/2.1.3.rst 2014-12-18 10:41:50 +0000
131@@ -4,7 +4,7 @@
132
133 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>`.
134
135-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.
136+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.
137
138 Bugs Fixed
139 ----------
140
141=== modified file 'storage/innobase/xtrabackup/doc/source/xtrabackup_bin/lru_dump.rst'
142--- storage/innobase/xtrabackup/doc/source/xtrabackup_bin/lru_dump.rst 2013-08-30 09:55:04 +0000
143+++ storage/innobase/xtrabackup/doc/source/xtrabackup_bin/lru_dump.rst 2014-12-18 10:41:50 +0000
144@@ -2,7 +2,7 @@
145 LRU dump backup
146 ================
147
148-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.
149+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.
150
151 .. image:: /_static/lru_dump.png
152
153
154=== modified file 'storage/innobase/xtrabackup/doc/source/xtrabackup_bin/xbk_option_reference.rst'
155--- storage/innobase/xtrabackup/doc/source/xtrabackup_bin/xbk_option_reference.rst 2014-09-10 11:42:45 +0000
156+++ storage/innobase/xtrabackup/doc/source/xtrabackup_bin/xbk_option_reference.rst 2014-12-18 10:41:50 +0000
157@@ -19,7 +19,7 @@
158
159 .. option:: --close-files
160
161- 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.
162+ 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.
163
164 .. option:: --compact
165

Subscribers

People subscribed via source and target branches