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

[Hrvoje Matijakovic]

[Alexey Kopytov (akopytov)]

review: Approve

=== modified file 'doc/source/innobackupex/incremental_backups_innobackupex.rst'
--- doc/source/innobackupex/incremental_backups_innobackupex.rst	2013-04-29 09:29:00 +0000
+++ doc/source/innobackupex/incremental_backups_innobackupex.rst	2013-11-06 16:06:25 +0000
@@ -17,7 +17,7 @@
 
   $ innobackupex /data/backups
 
-This will create a timestamped directory in :file:`/data/backups`. Assuming that the backup is done last day of the year, ``BASEDIR`` would be :file:`/data/backups/2013-03-31_23-01-18`, for example.
+This will create a timestamped directory in :file:`/data/backups`. Assuming that the backup is done last day of the month, ``BASEDIR`` would be :file:`/data/backups/2013-03-31_23-01-18`, for example.
 
 .. note:: You can use the :option:`innobackupex --no-timestamp` option to override this behavior and the backup will be created in the given directory.
 

=== modified file 'doc/source/xtrabackup_bin/incremental_backups_with_ps_56.rst'
--- doc/source/xtrabackup_bin/incremental_backups_with_ps_56.rst	2013-09-19 13:06:49 +0000
+++ doc/source/xtrabackup_bin/incremental_backups_with_ps_56.rst	2013-11-06 16:06:25 +0000
@@ -20,7 +20,7 @@
 
 To make an incremental backup, begin with a full backup as usual. The |xtrabackup| binary writes a file called :file:`xtrabackup_checkpoints` into the backup's target directory. This file contains a line showing the ``to_lsn``, which is the database's :term:`LSN` at the end of the backup. :doc:`Create the full backup <creating_a_backup>` with a command such as the following: ::
 
-  xtrabackup --backup --target-dir=/data/backup/ --datadir=/var/lib/mysql/
+  xtrabackup_56 --backup --target-dir=/data/backup/ --datadir=/var/lib/mysql/
 
 If you want a usable full backup, use :doc:`innobackupex <../innobackupex/innobackupex_script>` since `xtrabackup` itself won't copy table definitions, triggers, or anything else that's not .ibd.
 
@@ -28,42 +28,89 @@
 
   backup_type = full-backuped
   from_lsn = 0
-  to_lsn = 2066277743
-  last_lsn = 2066277743
+  to_lsn = 1546908388
+  last_lsn = 1574827339
   compact = 0
 
 Using the Log Archiving to prepare the backup
 =============================================
 
-In order to prepare the backup we need to specify the directory that contains the archived logs with the :option:`xtrabackup --archived-logs-dir` option: ::
+In order to prepare the backup we need to specify the directory that contains the archived logs with the :option:`xtrabackup --innodb-log-arch-dir` option: ::
 
- xtrabackup --prepare --target-dir=/data/backup/ --archived-logs-dir=/data/archived-logs/
+ xtrabackup_56 --prepare --target-dir=/data/backup/ --innodb-log-arch-dir=/data/archived-logs/
 
 This command will use archived logs, replay them against the backup folder and bring them up to date with the latest archived log.
 
 Output should look like this: ::
 
- InnoDB: Doing recovery: scanned up to log sequence number 712612864 (0 %)
- InnoDB: Doing recovery: scanned up to log sequence number 717855744 (0 %)
- InnoDB: Doing recovery: scanned up to log sequence number 723098624 (1 %)
- InnoDB: Doing recovery: scanned up to log sequence number 728341504 (1 %)
- ...
- InnoDB: Apply batch completed
- InnoDB: Doing recovery: scanned up to log sequence number 2066277743 (99 %)
- 130919  8:12:44  InnoDB: Starting an apply batch of log records to the database...
- InnoDB: Progress in percents: 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 
- InnoDB: Apply batch completed
- 130919  8:12:45 Percona XtraDB (http://www.percona.com) 5.1.70-14.6 started; log sequence number 2066277743
+  xtrabackup_56 version 2.1.5 for MySQL server 5.6.11 Linux (x86_64) (revision id: 680)
+  xtrabackup: cd to /tmp/backup-01/
+  xtrabackup: using the following InnoDB configuration for recovery:
+  xtrabackup:   innodb_data_home_dir = ./
+  xtrabackup:   innodb_data_file_path = ibdata1:10M:autoextend
+  xtrabackup:   innodb_log_group_home_dir = ./
+  xtrabackup:   innodb_log_files_in_group = 2
+  xtrabackup:   innodb_log_file_size = 50331648
+  InnoDB: Allocated tablespace 4, old maximum was 0
+  xtrabackup: using the following InnoDB configuration for recovery:
+  xtrabackup:   innodb_data_home_dir = ./
+  xtrabackup:   innodb_data_file_path = ibdata1:10M:autoextend
+  xtrabackup:   innodb_log_group_home_dir = ./
+  xtrabackup:   innodb_log_files_in_group = 2
+  xtrabackup:   innodb_log_file_size = 50331648
+  xtrabackup: Starting InnoDB instance for recovery.
+  xtrabackup: Using 104857600 bytes for buffer pool (set by --use-memory parameter)
+  InnoDB: The InnoDB memory heap is disabled
+  InnoDB: Mutexes and rw_locks use GCC atomic builtins
+  InnoDB: Compressed tables use zlib 1.2.3
+  InnoDB: Not using CPU crc32 instructions
+  InnoDB: Initializing buffer pool, size = 100.0M
+  InnoDB: Completed initialization of buffer pool
+  InnoDB: Setting log file ./ib_logfile101 size to 48 MB
+  InnoDB: Setting log file ./ib_logfile1 size to 48 MB
+  InnoDB: Renaming log file ./ib_logfile101 to ./ib_logfile0
+  InnoDB: New log files created, LSN=1627148
+  InnoDB:  Starting archive recovery from a backup...
+  InnoDB: Allocated tablespace 4, old maximum was 0
+  InnoDB: Opened archived log file /var/lib/mysql/ib_log_archive_00000000000000045568
+  InnoDB: Starting an apply batch of log records to the database...
+  InnoDB: Progress in percent: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 
+
+  ...
+
+  InnoDB: Apply batch completed
+  InnoDB: Starting an apply batch of log records to the database...
+  InnoDB: Progress in percent: 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 
+  InnoDB: Apply batch completed
+  InnoDB: 1 transaction(s) which must be rolled back or cleaned up
+  InnoDB: in total 5063 row operations to undo
+  InnoDB: Trx id counter is 4096
+
+  [notice (again)]
+  If you use binary log and don't use any hack of group commit,
+  the binary log position seems to be:
+
+  xtrabackup: starting shutdown with innodb_fast_shutdown = 1
+  InnoDB: Starting shutdown...
+  InnoDB: Shutdown completed; log sequence number 2013229561
 
 After this is completed successfully backup can be restored.
 
+You can check the :file:`xtrabackup_checkpoints` file and see that the backup_type has changed: ::
+
+   backup_type = full-prepared
+   from_lsn = 0
+   to_lsn = 1546908388
+   last_lsn = 1574827339
+   compact = 0
+
 .. note:: 
 
-   Archived logs can be applied to backup data several times, for example to decreasing backup size or time required for preparing the backup.
+   Archived logs can be applied to backup data several times, for example to decrease the backup size or time required for preparing the backup.
 
 Additional option is available if you need to restore a backup to specific point in time. By adding the :option:`xtrabackup --to-archived-lsn` option you can specify the LSN to which the backup will be prepared. ::
 
- xtrabackup --prepare --target-dir=/data/backup/ --archived-logs-dir=/data/archived-logs/ --to-archived-lsn=8155020800
+ xtrabackup_56 --prepare --target-dir=/data/backup/ --innodb-log-arch-dir=/data/archived-logs/ --to-archived-lsn=5536301566
 
 This will prepare the backup up to the specified Log Sequence Number.
  

=== modified file 'doc/source/xtrabackup_bin/xbk_option_reference.rst'
--- doc/source/xtrabackup_bin/xbk_option_reference.rst	2013-09-19 13:06:49 +0000
+++ doc/source/xtrabackup_bin/xbk_option_reference.rst	2013-11-06 16:06:25 +0000
@@ -13,10 +13,6 @@
 
    This option causes only the redo stage to be performed when preparing a backup. It is very important for incremental backups.
 
-.. option:: --archived-logs-dir 
-
-   This option is used to specify the directory containing the archived logs. It can only be used with the :option:`xtrabackup --prepare` option.
-
 .. option:: --backup
 
    Make a backup and place it in :option:`--target-dir`. See :doc:`Creating a backup <creating_a_backup>`.
@@ -81,6 +77,10 @@
 
    When creating an incremental backup, you can specify the log sequence number (:term:`LSN`) instead of specifying :option:`--incremental-basedir`. For databases created by *MySQL* and *Percona Server* 5.0-series versions, specify the :term:`LSN` as two 32-bit integers in high:low format. For databases created in 5.1 and later, specify the :term:`LSN` as a single 64-bit integer.  ##ATTENTION##: If a wrong LSN value is specified, it is impossible to diagnose this, causing the backup to be unusable. Be careful!
 
+.. option:: --innodb-log-arch-dir
+
+   This option is used to specify the directory containing the archived logs. It can only be used with the :option:`xtrabackup --prepare` option.
+
 .. option:: --innodb-miscellaneous
 
    There is a large group of InnoDB options that are normally read from the :term:`my.cnf` configuration file, so that xtrabackup boots up its embedded InnoDB in the same configuration as your current server. You normally do not need to specify these explicitly. These options have the same behavior that they have in InnoDB or XtraDB. They are as follows: ::