Merge lp:~hrvojem/percona-xtrabackup/bug1066978-2.1 into lp:percona-xtrabackup/2.1

Proposed by Hrvoje Matijakovic on 2012-11-20
Status: Merged
Approved by: Alexey Kopytov on 2012-11-22
Approved revision: 455
Merged at revision: 455
Proposed branch: lp:~hrvojem/percona-xtrabackup/bug1066978-2.1
Merge into: lp:percona-xtrabackup/2.1
Diff against target: 408 lines (+126/-115)
9 files modified
BUILD.txt (+1/-2)
doc/Makefile (+1/-1)
doc/source/innobackupex/innobackupex_option_reference.rst (+110/-90)
doc/source/installation/compiling_xtrabackup.rst (+4/-9)
doc/source/percona-theme/layout.html (+1/-8)
doc/source/release-notes/2.0/2.0.3.rst (+1/-1)
doc/source/xtrabackup_bin/configuring.rst (+1/-1)
innobackupex (+6/-2)
utils/build.sh (+1/-1)
To merge this branch: bzr merge lp:~hrvojem/percona-xtrabackup/bug1066978-2.1
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) 2012-11-20 Approve on 2012-11-22
Review via email: mp+135200@code.launchpad.net
To post a comment you must log in.
Alexey Kopytov (akopytov) wrote :

Everything looks good, except a couple of 2.1-specific things:

- The 2.1 MP should have "lp:percona-xtrabackup/2.1" instead of
"lp:percona-xtrabackup/2.0" in compiling_xtrabackup.rst.

- --remote-host was removed in 2.1, so it shouldn't be mentioned in
    innobackupex help

review: Needs Fixing
Alexey Kopytov (akopytov) wrote :

Text conflict in doc/source/innobackupex/innobackupex_option_reference.rst
Text conflict in utils/build.sh

review: Needs Fixing
Alexey Kopytov (akopytov) wrote :

hmm, not sure what happened, but where did the "rearrange alphabetically" changes go?

and this one is probably unintentional:

=== modified file 'utils/build.sh' (properties changed: +x to -x)

455. By Hrvoje Matijakovic on 2012-11-22

- Bug fixes for bug: Bug #1073502, Bug #1075269 and Bug #1066978
- updated the Makefile to use PXB-2.1 theme instead of 2.0

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 'BUILD.txt'
2--- BUILD.txt 2012-06-04 10:29:26 +0000
3+++ BUILD.txt 2012-11-22 09:58:24 +0000
4@@ -30,8 +30,7 @@
5 ================== ========= =============================================
6 Value Alias Server
7 ================== ========= =============================================
8- innodb51_builtin 5.1 build against built-in InnoDB in MySQL 5.1
9- innodb51 plugin build agsinst InnoDB plugin in MySQL 5.1
10+ innodb51 plugin build against InnoDB plugin in MySQL 5.1
11 innodb55 5.5 build against InnoDB in MySQL 5.5
12 xtradb51 xtradb build against Percona Server with XtraDB 5.1
13 xtradb55 xtradb55 build against Percona Server with XtraDB 5.5
14
15=== modified file 'doc/Makefile'
16--- doc/Makefile 2012-08-03 12:12:02 +0000
17+++ doc/Makefile 2012-11-22 09:58:24 +0000
18@@ -38,7 +38,7 @@
19
20 html:
21 @echo "Downloading percona-theme ..."
22- @wget -O percona-theme.tar.gz http://percona.com/docs/theme/percona-xtrabackup/2.0
23+ @wget -O percona-theme.tar.gz http://percona.com/docs/theme/percona-xtrabackup/2.1
24 @echo "Extracting theme."
25 @tar -zxf percona-theme.tar.gz
26 @rm -rf source/percona-theme
27
28=== modified file 'doc/source/innobackupex/innobackupex_option_reference.rst'
29--- doc/source/innobackupex/innobackupex_option_reference.rst 2012-11-13 05:25:19 +0000
30+++ doc/source/innobackupex/innobackupex_option_reference.rst 2012-11-22 09:58:24 +0000
31@@ -10,106 +10,69 @@
32 Options
33 =======
34
35-.. option:: --help
36-
37- This option displays a help screen and exits.
38-
39-.. option:: --version
40-
41- This option displays the |innobackupex| version and copyright notice and then exits.
42-
43 .. option:: --apply-log
44
45 Prepare a backup in ``BACKUP-DIR`` by applying the transaction log file named :file:`xtrabackup_logfile` located in the same directory. Also, create new transaction logs. The InnoDB configuration is read from the file :file:`backup-my.cnf` created by |innobackupex| when the backup was made.
46
47-.. option:: --redo-only
48-
49- This option is passed directly to xtrabackup's :option:`xtrabackup --apply-log-only` option. This forces :program:`xtrabackup` to skip the "rollback" phase and do a "redo" only. This is necessary if the backup will have incremental changes applied to it later. See the |xtrabackup| :doc:`documentation <../xtrabackup_bin/incremental_backups>` for details.
50+.. option:: --compact
51+
52+ Create a compact backup with all secondary index pages omitted. This option is passed directly to xtrabackup. See the :program:`xtrabackup` :doc:`documentation <../xtrabackup_bin/xtrabackup_binary>` for details.
53+
54+.. option:: --compress
55+
56+ This option instructs xtrabackup to compress backup copies of InnoDB data files. It is passed directly to the xtrabackup child process. See the :program:`xtrabackup` :doc:`documentation <../xtrabackup_bin/xtrabackup_binary>` for details.
57+
58+.. option:: --compress-threads
59+
60+ This option specifies the number of worker threads that will be used for parallel compression. It is passed directly to the xtrabackup child process. See the :program:`xtrabackup` :doc:`documentation <../xtrabackup_bin/xtrabackup_binary>` for details.
61
62 .. option:: --copy-back
63
64 Copy all the files in a previously made backup from the backup directory to their original locations.
65
66-.. option:: --move-back
67-
68- Move all the files in a previously made backup from the backup directory to their original locations. As this option removes backup files, it must be used with caution.
69-
70-.. option:: --include=REGEXP
71-
72- This option is a regular expression to be matched against table names in ``databasename.tablename`` format. It is passed directly to :program:`xtrabackup` 's :option:`xtrabackup --tables` option. See the :program:`xtrabackup` documentation for details.
73+.. option:: --databases=LIST
74+
75+ This option specifies the list of databases that |innobackupex| should back up. The option accepts a string argument or path to file that contains the list of databases to back up. The list is of the form "databasename1[.table_name1] databasename2[.table_name2] . . .". If this option is not specified, all databases containing |MyISAM| and |InnoDB| tables will be backed up. Please make sure that --databases contains all of the |InnoDB| databases and tables, so that all of the innodb.frm files are also backed up. In case the list is very long, this can be specified in a file, and the full path of the file can be specified instead of the list. (See option --tables-file.)
76
77 .. option:: --defaults-file=[MY.CNF]
78
79 This option accepts a string argument that specifies what file to read the default MySQL options from. It is also passed directly to :program:`xtrabackup` 's defaults-file option. See the :program:`xtrabackup` :doc:`documentation <../xtrabackup_bin/xtrabackup_binary>` for details.
80
81-.. option:: --databases=LIST
82-
83- This option specifies the list of databases that |innobackupex| should back up. The option accepts a string argument or path to file that contains the list of databases to back up. The list is of the form "databasename1[.table_name1] databasename2[.table_name2] . . .". If this option is not specified, all databases containing |MyISAM| and |InnoDB| tables will be backed up. Please make sure that --databases contains all of the |InnoDB| databases and tables, so that all of the innodb.frm files are also backed up. In case the list is very long, this can be specified in a file, and the full path of the file can be specified instead of the list. (See option --tables-file.)
84-
85-.. option:: --tables-file
86-
87- This option accepts a string argument that specifies the file in which there are a list of names of the form ``database.table``, one per line. The option is passed directly to :program:`xtrabackup` 's :option:`--tables-file` option.
88-
89-.. option:: --throttle
90-
91- This option accepts an integer argument that specifies the number of I/O operations (i.e., pairs of read+write) per second. It is passed directly to xtrabackup's :option:`xtrabackup --throttle` option.
92+.. option:: --defaults-group=GROUP-NAME
93+
94+ This option accepts a string argument that specifies the group which should be read from the configuration file. This is needed if you use mysqld_multi.
95
96 .. option:: --export
97
98 This option is passed directly to :option:`xtrabackup --export` option. It enables exporting individual tables for import into another server. See the |xtrabackup| documentation for details.
99
100-.. option:: --use-memory
101-
102- This option accepts a string argument that specifies the amount of memory in bytes for :program:`xtrabackup` to use for crash recovery while preparing a backup. Multiples are supported providing the unit (e.g. 1MB, 1GB). It is used only with the option :option:`--apply-log`. It is passed directly to |xtrabackup| 's :option:`xtrabackup --use-memory` option. See the |xtrabackup| documentation for details.
103-
104-.. option:: --password=PASSWORD
105-
106- This option accepts a string argument specifying the password to use when connecting to the database. It is passed to the :command:`mysql` child process without alteration. See :command:`mysql --help` for details.
107-
108-.. option:: --user=USER
109-
110- This option accepts a string argument that specifies the user (i.e., the *MySQL* username used when connecting to the server) to login as, if that's not the current user. It is passed to the mysql child process without alteration. See :command:`mysql --help` for details.
111-
112-.. option:: --port=PORT
113-
114- This option accepts a string argument that specifies the port to use when connecting to the database server with TCP/IP. It is passed to the :command:`mysql` child process. It is passed to the :command:`mysql` child process without alteration. See :command:`mysql --help` for details.
115-
116-.. option:: --defaults-group
117-
118- This option accepts a string argument that specifies the group which should be read from the configuration file. This is needed if you use mysqld_multi.
119-
120-.. option:: --socket
121-
122- This option accepts a string argument that specifies the socket to use when connecting to the local database server with a UNIX domain socket. It is passed to the mysql child process without alteration. See :command:`mysql --help` for details.
123+.. option:: --extra-lsndir=DIRECTORY
124+
125+ This option accepts a string argument that specifies the directory in which to save an extra copy of the :file:`xtrabackup_checkpoints` file. It is passed directly to |xtrabackup|'s :option:`--extra-lsndir` option. See the :program:`xtrabackup` documentation for details.
126+
127+.. option:: --galera-info
128+
129+ This options creates the ``xtrabackup_galera_info`` file which contains the local node state at the time of the backup. Option should be used when performing the backup of Percona-XtraDB-Cluster.
130+
131+.. option:: --help
132+
133+ This option displays a help screen and exits.
134
135 .. option:: --host=HOST
136
137 This option accepts a string argument that specifies the host to use when connecting to the database server with TCP/IP. It is passed to the mysql child process without alteration. See :command:`mysql --help` for details.
138
139-.. option:: --no-timestamp
140-
141- This option prevents creation of a time-stamped subdirectory of the ``BACKUP-ROOT-DIR`` given on the command line. When it is specified, the backup is done in ``BACKUP-ROOT-DIR`` instead.
142-
143-.. option:: --galera-info
144-
145- This options creates the ``xtrabackup_galera_info`` file which contains the local node state at the time of the backup. Option should be used when performing the backup of Percona-XtraDB-Cluster.
146-
147-.. option:: --slave-info
148-
149- This option is useful when backing up a replication slave server. It prints the binary log position and name of the master server. It also writes this information to the :file:`xtrabackup_slave_info` file as a ``CHANGE MASTER`` command. A new slave for this master can be set up by starting a slave server on this backup and issuing a ``CHANGE MASTER`` command with the binary log position saved in the :file:`xtrabackup_slave_info` file.
150-
151-.. option:: --no-lock
152-
153- Use this option to disable table lock with ``FLUSH TABLES WITH READ LOCK``. Use it only if ALL your tables are InnoDB and you **DO NOT CARE** about the binary log position of the backup.
154- If you are considering to use :option:`--no-lock` because your backups are failing to acquire the lock, this could be because of incoming replication events preventing the lock from succeeding. Please try using :option:`--safe-slave-backup` to momentarily stop the replication slave thread, this may help the backup to succeed and you then don't need to resort to using :option:`--no-lock`.
155-
156-.. option:: --ibbackup = 'autodetect'
157-
158- This option accepts a string argument that specifies which xtrabackup binary should be used. The string should be the command used to run *XtraBackup*. The option can be useful if the :program:`xtrabackup` binary is not in your search path or working directory and the database server is not accessible at the moment. If this option is not specified, :program:`innobackupex` attempts to determine the binary to use automatically. By default, :program:`xtrabackup` is the command used. When option :option:`--apply-log` is specified, the binary is used whose name is in the file :file:`xtrabackup_binary` in the backup directory, if that file exists, or will attempt to autodetect it. However, if :option:`--copy-back` or :option:`--move-back` is used, :program:`xtrabackup` is used unless other is specified.
159+.. option:: --ibbackup=IBBACKUP-BINARY
160+
161+ This option accepts a string argument that specifies which |xtrabackup| binary should be used. The string should be the command used to run *XtraBackup*. The option can be useful if the :program:`xtrabackup` binary is not in your search path or working directory and the database server is not accessible at the moment. If this option is not specified, :program:`innobackupex` attempts to determine the binary to use automatically. By default, :program:`xtrabackup` is the command used. When option :option:`--apply-log` is specified, the binary is used whose name is in the file :file:`xtrabackup_binary` in the backup directory, if that file exists, or will attempt to autodetect it. However, if :option:`--copy-back` or :option:`--move-back` is used, :program:`xtrabackup` is used unless other is specified.
162+
163+.. option:: --include=REGEXP
164+
165+ This option is a regular expression to be matched against table names in ``databasename.tablename`` format. It is passed directly to |xtrabackup|'s :option:`xtrabackup --tables` option. See the :program:`xtrabackup` documentation for details.
166
167 .. option:: --incremental
168
169- This option tells :program:`xtrabackup` to create an incremental backup, rather than a full one. It is passed to the :program:`xtrabackup` child process. When this option is specified, either :option:`--incremental-lsn` or :option:`--incremental-basedir` can also be given. If neither option is given, option :option:`--incremental-basedir` is passed to :program:`xtrabackup` by default, set to the first timestamped backup directory in the backup base directory.
170+ This option tells |xtrabackup| to create an incremental backup, rather than a full one. It is passed to the |xtrabackup| child process. When this option is specified, either :option:`--incremental-lsn` or :option:`--incremental-basedir` can also be given. If neither option is given, option :option:`--incremental-basedir` is passed to :program:`xtrabackup` by default, set to the first timestamped backup directory in the backup base directory.
171
172 .. option:: --incremental-basedir=DIRECTORY
173
174@@ -121,23 +84,40 @@
175
176 .. option:: --incremental-lsn
177
178- This option accepts a string argument that specifies the log sequence number (:term:`LSN`) to use for the incremental backup. It is used with the :option:`--incremental` option. It is used instead of specifying :option:`--incremental-basedir`. For databases created by *MySQL* and *Percona Server* 5.0-series versions, specify the as two 32-bit integers in high:low format. For databases created in 5.1 and later, specify the LSN as a single 64-bit integer.
179-
180-.. option:: --extra-lsndir=DIRECTORY
181-
182- This option accepts a string argument that specifies the directory in which to save an extra copy of the :file:`xtrabackup_checkpoints` file. It is passed directly to |xtrabackup|'s :option:`--extra-lsndir` option. See the :program:`xtrabackup` documentation for details.
183-
184-.. option:: --stream=STREAMNAME
185-
186- This option accepts a string argument that specifies the format in which to do the streamed backup. The backup will be done to ``STDOUT`` in the specified format. Currently, supported formats are `tar` and `xbstream`. Uses :doc:`xbstream <../xbstream/xbstream>`, which is available in *XtraBackup* distributions. If you specify a path after this option, it will be interpreted as the value of :option:`tmpdir`.
187-
188-.. option:: --tmpdir=DIRECTORY
189-
190- This option accepts a string argument that specifies the location where a temporary file will be stored. It should be used when :option:`--stream` is specified. For these options, the transaction log will first be stored to a temporary file, before streaming. This option specifies the location where that temporary file will be stored. If the option is not specifed, the default is to use the value of ``tmpdir`` read from the server configuration.
191+ This option accepts a string argument that specifies the log sequence number (:term:`LSN`) to use for the incremental backup. It is used with the :option:`--incremental` option. It is used instead of specifying :option:`--incremental-basedir`. For databases created by *MySQL* and *Percona Server* 5.0-series versions, specify the as two 32-bit integers in high:low format. For databases created in 5.1 and later, specify the LSN as a single 64-bit integer.
192+
193+.. option:: --move-back
194+
195+ Move all the files in a previously made backup from the backup directory to their original locations. As this option removes backup files, it must be used with caution.
196+
197+.. option:: --no-lock
198+
199+ Use this option to disable table lock with ``FLUSH TABLES WITH READ LOCK``. Use it only if ALL your tables are InnoDB and you **DO NOT CARE** about the binary log position of the backup.
200+ If you are considering to use :option:`--no-lock` because your backups are failing to acquire the lock, this could be because of incoming replication events preventing the lock from succeeding. Please try using :option:`--safe-slave-backup` to momentarily stop the replication slave thread, this may help the backup to succeed and you then don't need to resort to using :option:`--no-lock`
201+
202+.. option:: --no-timestamp
203+
204+ This option prevents creation of a time-stamped subdirectory of the ``BACKUP-ROOT-DIR`` given on the command line. When it is specified, the backup is done in ``BACKUP-ROOT-DIR`` instead.
205
206 .. option:: --parallel=NUMBER-OF-THREADS
207
208- This option accepts an integer argument that specifies the number of threads the :program:`xtrabackup` child process should use to back up files concurrently. Note that this option works on file level, that is, if you have several .ibd files, they will be copied in parallel. If you have just single big .ibd file, it will have no effect. It is passed directly to xtrabackup's :option:`xtrabackup --parallel` option. See the :program:`xtrabackup` documentation for details.
209+ This option accepts an integer argument that specifies the number of threads the :program:`xtrabackup` child process should use to back up files concurrently. Note that this option works on file level, that is, if you have several .ibd files, they will be copied in parallel. If you have just single big .ibd file, it will have no effect. It is passed directly to xtrabackup's :option:`xtrabackup --parallel` option. See the :program:`xtrabackup` documentation for details
210+
211+.. option:: --password=PASSWORD
212+
213+ This option accepts a string argument specifying the password to use when connecting to the database. It is passed to the :command:`mysql` child process without alteration. See :command:`mysql --help` for details.
214+
215+.. option:: --port=PORT
216+
217+ This option accepts a string argument that specifies the port to use when connecting to the database server with TCP/IP. It is passed to the :command:`mysql` child process. It is passed to the :command:`mysql` child process without alteration. See :command:`mysql --help` for details.
218+
219+.. option:: --redo-only
220+
221+ This option is passed directly to xtrabackup's :option:`xtrabackup --apply-log-only` option. This forces :program:`xtrabackup` to skip the "rollback" phase and do a "redo" only. This is necessary if the backup will have incremental changes applied to it later. See the |xtrabackup| :doc:`documentation <../xtrabackup_bin/incremental_backups>` for details.
222+
223+.. option:: --rsync
224+
225+ Uses the :program:`rsync` utility to optimize local file transfers. When this option is specified, :program:`innobackupex` uses :program:`rsync` to copy all non-InnoDB files instead of spawning a separate :program:`cp` for each file, which can be much faster for servers with a large number of databases or tables. This option cannot be used together with :option:`--stream`.
226
227 .. option:: --safe-slave-backup
228
229@@ -147,6 +127,46 @@
230
231 How many seconds :option:`--safe-slave-backup`` should wait for ``Slave_open_temp_tables`` to become zero. Defaults to 300 seconds.
232
233-.. option:: --rsync
234-
235- Use the :program:`rsync` utility to optimize local file transfers. When this option is specified, :program:`innobackupex` uses :program:`rsync` to copy all non-InnoDB files instead of spawning a separate :program:`cp` for each file, which can be much faster for servers with a large number of databases or tables. This option cannot be used together with :option:`--stream`.
236+.. option:: --scpopt = SCP-OPTIONS
237+
238+ This option accepts a string argument that specifies the command line options to pass to :command:`scp` when the option :option:`--remost-host` is specified. If the option is not specified, the default options are ``-Cp -c arcfour``.
239+
240+.. option:: --sshopt = SSH-OPTIONS
241+
242+ This option accepts a string argument that specifies the command line options to pass to :command:`ssh` when the option :option:`--remost-host` is specified.
243+
244+.. option:: --slave-info
245+
246+ This option is useful when backing up a replication slave server. It prints the binary log position and name of the master server. It also writes this information to the :file:`xtrabackup_slave_info` file as a ``CHANGE MASTER`` command. A new slave for this master can be set up by starting a slave server on this backup and issuing a ``CHANGE MASTER`` command with the binary log position saved in the :file:`xtrabackup_slave_info` file.
247+
248+.. option:: --socket
249+
250+ This option accepts a string argument that specifies the socket to use when connecting to the local database server with a UNIX domain socket. It is passed to the mysql child process without alteration. See :command:`mysql --help` for details.
251+
252+.. option:: --stream=STREAMNAME
253+
254+ This option accepts a string argument that specifies the format in which to do the streamed backup. The backup will be done to ``STDOUT`` in the specified format. Currently, supported formats are `tar` and `xbstream`. Uses :doc:`xbstream <../xbstream/xbstream>`, which is available in *XtraBackup* distributions. If you specify a path after this option, it will be interpreted as the value of :option:`tmpdir`
255+
256+.. option:: --tables-file=FILE
257+
258+ This option accepts a string argument that specifies the file in which there are a list of names of the form ``database.table``, one per line. The option is passed directly to :program:`xtrabackup` 's :option:`--tables-file` option.
259+
260+.. option:: --throttle=IOS
261+
262+ This option accepts an integer argument that specifies the number of I/O operations (i.e., pairs of read+write) per second. It is passed directly to xtrabackup's :option:`xtrabackup --throttle` option.
263+
264+.. option:: --tmpdir=DIRECTORY
265+
266+ This option accepts a string argument that specifies the location where a temporary file will be stored. It should be used when :option:`--stream` is specified. For these options, the transaction log will first be stored to a temporary file, before streaming or copying to a remote host. This option specifies the location where that temporary file will be stored. If the option is not specified, the default is to use the value of ``tmpdir`` read from the server configuration.
267+
268+.. option:: --use-memory
269+
270+ This option accepts a string argument that specifies the amount of memory in bytes for :program:`xtrabackup` to use for crash recovery while preparing a backup. Multiples are supported providing the unit (e.g. 1MB, 1GB). It is used only with the option :option:`--apply-log`. It is passed directly to |xtrabackup| 's :option:`xtrabackup --use-memory` option. See the |xtrabackup| documentation for details.
271+
272+.. option:: --user=USER
273+
274+ This option accepts a string argument that specifies the user (i.e., the *MySQL* username used when connecting to the server) to login as, if that's not the current user. It is passed to the mysql child process without alteration. See :command:`mysql --help` for details.
275+
276+.. option:: --version
277+
278+ This option displays the |innobackupex| version and copyright notice and then exits.
279
280=== modified file 'doc/source/installation/compiling_xtrabackup.rst'
281--- doc/source/installation/compiling_xtrabackup.rst 2012-06-04 10:29:26 +0000
282+++ doc/source/installation/compiling_xtrabackup.rst 2012-11-22 09:58:24 +0000
283@@ -4,11 +4,7 @@
284
285 The source code is available from the *Launchpad* project `here <https://launchpad.net/percona-xtrabackup>`_. The easiest way to get the code is with :command:`bzr branch` of the desired release, such as the following: ::
286
287- bzr branch lp:percona-xtrabackup/1.6
288-
289-or ::
290-
291- bzr branch lp:percona-xtrabackup
292+ bzr branch lp:percona-xtrabackup/2.0
293
294 You should then have a directory named after the release you branched, such as ``percona-xtrabackup``.
295
296@@ -23,8 +19,8 @@
297
298 In Debian-based distributions, you need to: ::
299
300- $ apt-get install build-essential flex bison automake autoconf bzr \
301- libtool cmake libaio-dev mysql-client libncurses-dev zlib1g-dev
302+ $ apt-get install debhelper autotools-dev libaio-dev wget automake \
303+ libtool bison libncurses-dev libz-dev cmake bzr
304
305 In ``RPM``-based distributions, you need to: ::
306
307@@ -41,8 +37,7 @@
308 ================== ========= ============================================
309 Value Alias Server
310 ================== ========= ============================================
311- innodb51_builtin 5.1 build against built-in InnoDB in MySQL 5.1
312- innodb51 plugin build agsinst InnoDB plugin in MySQL 5.1
313+ innodb51 plugin build against InnoDB plugin in MySQL 5.1
314 innodb55 5.5 build against InnoDB in MySQL 5.5
315 xtradb51 xtradb build against Percona Server with XtraDB 5.1
316 xtradb55 xtradb55 build against Percona Server with XtraDB 5.5
317
318=== modified file 'doc/source/percona-theme/layout.html'
319--- doc/source/percona-theme/layout.html 2012-09-19 11:35:43 +0000
320+++ doc/source/percona-theme/layout.html 2012-11-22 09:58:24 +0000
321@@ -74,14 +74,7 @@
322 </div>
323 </div>
324
325- <div class="side-column-block">
326- <div class="a-btn-container">
327- <a title="Download PDF Manual for Percona XtraBackup 2.0" href="http://form.percona.com/Percona_XtraBackup_2_0_Operations_Manual.html" class="a-btn-new">
328- <span class="a-btn-text">Download Manual</span>
329- <span class="a-btn-fixed-slide-text">PDF for version 2.0</span>
330- <span class="a-btn-icon-right"><span></span></span>
331- </a>
332- </div></div>
333+
334
335 <div class="percona_com_ad" style="width:220px;"><script type="text/javascript" src="http://www.percona.com/ads.php?size=220x120"></script></div>
336
337
338=== modified file 'doc/source/release-notes/2.0/2.0.3.rst'
339--- doc/source/release-notes/2.0/2.0.3.rst 2012-10-01 09:22:03 +0000
340+++ doc/source/release-notes/2.0/2.0.3.rst 2012-11-22 09:58:24 +0000
341@@ -18,7 +18,7 @@
342
343 * |XtraBackup| 2.0.2 was not backwards compatible which caused incremental backups created with previous versions to fail on prepare. Bug fixed :bug:`1038127` (*Sergei Glushchenko*).
344
345- * Fix for bug :bug:`1022562` introduced a regression that may potentially lead to a 5x increase in disk space occupied by incremental backups. Bug fixed :bug:`1028949` (*Laurynas Biveinis*).
346+ * Fix for bug :bug:`1022562` introduced a regression that may potentially lead to a 5x increase in disk space occupied by incremental backups. Bug fixed :bug:`1043762` (*Laurynas Biveinis*).
347
348 * A regression was introduced in fix for bug :bug:`932623` which caused incorrect handling of compressed tablespaces with the page size of 16K, that were created between the last full or incremental and the next incremental backup. Bugs fixed :bug:`1049174` and :bug:`1044398` (*Laurynas Biveinis*).
349
350
351=== modified file 'doc/source/xtrabackup_bin/configuring.rst'
352--- doc/source/xtrabackup_bin/configuring.rst 2011-07-07 05:32:50 +0000
353+++ doc/source/xtrabackup_bin/configuring.rst 2012-11-22 09:58:24 +0000
354@@ -3,7 +3,7 @@
355
356 All of the |xtrabackup| configuration is done through options, which behave exactly like standard |MySQL| program options: they can be specified either at the command-line, or through a file such as :file:`/etc/my.cnf`.
357
358-The |xtrabackup| binary reads the ``[myslqd]`` and ``[xtrabackup]`` sections from any configuration files, in that order. That is so that it can read its options from your existing |MySQL| installation, such as the :term:`datadir` or some of the |InnoDB| options. If you want to override these, just specify them in the ``[xtrabackup]`` section, and because it is read later, it will take precedence.
359+The |xtrabackup| binary reads the ``[mysqld]`` and ``[xtrabackup]`` sections from any configuration files, in that order. That is so that it can read its options from your existing |MySQL| installation, such as the :term:`datadir` or some of the |InnoDB| options. If you want to override these, just specify them in the ``[xtrabackup]`` section, and because it is read later, it will take precedence.
360
361 You don't need to put any configuration in your :file:`my.cnf` if you don't want to. You can simply specify the options on the command-line. Normally, the only thing you might find convenient to place in the ``[xtrabackup]`` section of your :file:`my.cnf` file is the ``target_dir`` option to default the directory in which the backups will be placed, for example,
362
363
364=== modified file 'innobackupex'
365--- innobackupex 2012-11-21 13:51:49 +0000
366+++ innobackupex 2012-11-22 09:58:24 +0000
367@@ -2769,6 +2769,10 @@
368
369 This option is passed directly to xtrabackup's --apply-log-only option. This forces xtrabackup to skip the "rollback" phase and do a "redo" only. This is necessary if the backup will have incremental changes applied to it later. See the xtrabackup documentation for details.
370
371+=item --rsync
372+
373+Uses the rsync utility to optimize local file transfers. When this option is specified, innobackupex uses rsync to copy all non-InnoDB files instead of spawning a separate cp for each file, which can be much faster for servers with a large number of databases or tables. This option cannot be used together with --stream.
374+
375 =item --safe-slave-backup
376
377 Stop slave SQL thread and wait to start backup until Slave_open_temp_tables in "SHOW STATUS" is zero. If there are no open temporary tables, the backup will take place, otherwise the SQL thread will be started and stopped until there are no open temporary tables. The backup will fail if Slave_open_temp_tables does not become zero after --safe-slave-backup-timeout seconds. The slave SQL thread will be restarted when the backup finishes.
378@@ -2785,7 +2789,7 @@
379
380 This option specifies the socket to use when connecting to the local database server with a UNIX domain socket. The option accepts a string argument. It is passed to the mysql child process without alteration. See mysql --help for details.
381
382-=item --stream=[tar|. . .]
383+=item --stream=STREAMNAME
384
385 This option specifies the format in which to do the streamed backup. The option accepts a string argument. The backup will be done to STDOUT in the specified format. Currently, the only supported formats are tar and xbstream. This option is passed directly to xtrabackup's --stream option.
386
387@@ -2799,7 +2803,7 @@
388
389 =item --tmpdir=DIRECTORY
390
391-This option specifies the location where a temporary file will be stored. The option accepts a string argument. It should be used when --stream is specified. For these options, the transaction log will first be stored to a temporary file, before streaming. This option specifies the location where that temporary file will be stored. If the option is not specifed, the default is to use the value of tmpdir read from the server configuration.
392+This option specifies the location where a temporary file will be stored. The option accepts a string argument. It should be used when --stream is specified. For these options, the transaction log will first be stored to a temporary file, before streaming. This option specifies the location where that temporary file will be stored. If the option is not specified, the default is to use the value of tmpdir read from the server configuration.
393
394 =item --use-memory=B
395
396
397=== modified file 'utils/build.sh'
398--- utils/build.sh 2012-11-14 01:02:10 +0000
399+++ utils/build.sh 2012-11-22 09:58:24 +0000
400@@ -43,7 +43,7 @@
401 echo
402 echo "Usage: `basename $0` CODEBASE"
403 echo "where CODEBASE can be one of the following values or aliases:"
404- echo " innodb51 | plugin build agsinst InnoDB plugin in MySQL 5.1"
405+ echo " innodb51 | plugin build against InnoDB plugin in MySQL 5.1"
406 echo " innodb55 | 5.5 build against InnoDB in MySQL 5.5"
407 echo " xtradb51 | xtradb build against Percona Server with XtraDB 5.1"
408 echo " xtradb55 | xtradb55 build against Percona Server with XtraDB 5.5"

Subscribers

People subscribed via source and target branches