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

Proposed by Hrvoje Matijakovic on 2012-10-16
Status: Merged
Approved by: Alexey Kopytov on 2012-10-28
Approved revision: 442
Merge reported by: Hrvoje Matijakovic
Merged at revision: not available
Proposed branch: lp:~hrvojem/percona-xtrabackup/bug1065761-2.1
Merge into: lp:percona-xtrabackup/2.1
Diff against target: 137 lines (+55/-34)
5 files modified
doc/source/howtos/setting_up_replication.rst (+1/-1)
doc/source/index.rst (+1/-0)
doc/source/innobackupex/creating_a_backup_ibk.rst (+1/-32)
doc/source/xtrabackup-files.rst (+51/-0)
innobackupex (+1/-1)
To merge this branch: bzr merge lp:~hrvojem/percona-xtrabackup/bug1065761-2.1
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) 2012-10-16 Approve on 2012-10-28
Review via email: mp+129857@code.launchpad.net
To post a comment you must log in.
441. By Alexey Kopytov on 2012-10-16

Manual merge from 2.0 (conflict in innobackupex).

442. By Hrvoje Matijakovic on 2012-10-24

Bugfixes for bugs: Bug #1066836, Bug #1059945, Bug #1065761

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/howtos/setting_up_replication.rst'
2--- doc/source/howtos/setting_up_replication.rst 2012-02-02 20:22:08 +0000
3+++ doc/source/howtos/setting_up_replication.rst 2012-10-24 18:52:21 +0000
4@@ -231,7 +231,7 @@
5 .. code-block:: mysql
6
7 TheNEWSlave|mysql> CHANGE MASTER TO
8- MASTER_HOST='$masterip'
9+ MASTER_HOST='$masterip',
10 MASTER_USER='repl',
11 MASTER_PASSWORD='$slavepass',
12 MASTER_LOG_FILE='TheMaster-bin.000001',
13
14=== modified file 'doc/source/index.rst'
15--- doc/source/index.rst 2012-02-02 20:23:58 +0000
16+++ doc/source/index.rst 2012-10-24 18:52:21 +0000
17@@ -70,6 +70,7 @@
18 faq
19 release-notes
20 glossary
21+ xtrabackup-files
22 trademark-policy
23
24 Indices and tables
25
26=== modified file 'doc/source/innobackupex/creating_a_backup_ibk.rst'
27--- doc/source/innobackupex/creating_a_backup_ibk.rst 2012-04-21 07:12:28 +0000
28+++ doc/source/innobackupex/creating_a_backup_ibk.rst 2012-10-24 18:52:21 +0000
29@@ -23,38 +23,7 @@
30
31 |innobackupex| called |xtrabackup| binary to backup all the data of |InnoDB| tables (see :doc:`../xtrabackup_bin/creating_a_backup` for details on this process) and copied all the table definitions in the database (:term:`.frm` files), data and files related to |MyISAM|, :term:`MERGE <.MRG>` (reference to other tables), :term:`CSV <.CSV>` and :term:`ARCHIVE <.ARM>` tables, along with :term:`triggers <.TRG>` and :term:`database configuration information <.opt>` to a time stamped directory created in the provided path.
32
33-It will also create the following files for convenience on the created directory:
34-
35- * Information related to the backup and the server
36-
37- * :file:`xtrabackup_checkpoints`
38- The type of the backup (e.g. full or incremental), its state (e.g. prepared) and the |LSN| range contained in it. This information is used for incremental backups.
39-
40- * :file:`xtrabackup_binlog_info`
41- The binary log file used by the server and its position at the moment of the backup. Result of the :command:`SHOW MASTER STATUS`.
42-
43- * :file:`xtrabackup_binlog_pos_innodb`
44- The binary log file and its current position for |InnoDB| or |XtraDB| tables.
45-
46- * :file:`xtrabackup_binary`
47- The |xtrabackup| binary used in the process.
48-
49- * :file:`backup-my.cnf`
50- This file contains information to start the mini instance of InnoDB during the :option:`--apply-log`. This is NOT a backup of original :file:`my.cnf`.
51-
52- * :file:`xtrabackup_logfile`
53- Contains data needed for running the: :option:`--apply-log`. The bigger this file is the :option:`--apply-log` process will take longer to finish.
54-
55- * Information related to the replication environment (if using the :option:`--slave-info` option):
56-
57- * :file:`xtrabackup_slave_info`
58- The ``CHANGE MASTER`` statement needed for setting up a slave.
59-
60- * The output of :program:`mysqld` during the backup process:
61-
62- * :file:`mysql-stderr`
63-
64- * :file:`mysql-stdout`
65+It will also create the :ref:`following files <xtrabackup_files>` for convenience on the created directory.
66
67 Other options to consider
68 =========================
69
70=== added file 'doc/source/xtrabackup-files.rst'
71--- doc/source/xtrabackup-files.rst 1970-01-01 00:00:00 +0000
72+++ doc/source/xtrabackup-files.rst 2012-10-24 18:52:21 +0000
73@@ -0,0 +1,51 @@
74+.. _xtrabackup_files :
75+
76+=====================================
77+Index of files created by XtraBackup
78+=====================================
79+
80+* Information related to the backup and the server
81+
82+ * :file:`backup-my.cnf`
83+ This file contains information to start the mini instance of InnoDB during the :option:`--apply-log`. This is **NOT** a backup of original :file:`my.cnf`.
84+
85+ * :file:`xtrabackup_checkpoints`
86+ The type of the backup (e.g. full or incremental), its state (e.g. prepared) and the |LSN| range contained in it. This information is used for incremental backups.
87+ Example of the :file:`xtrabackup_checkpoints` after taking a full backup: ::
88+
89+ backup_type = full-backuped
90+ from_lsn = 0
91+ to_lsn = 15188961605
92+ last_lsn = 15188961605
93+
94+ Example of the :file:`xtrabackup_checkpoints` after taking an incremental backup: ::
95+
96+ backup_type = incremental
97+ from_lsn = 15188961605
98+ to_lsn = 15189350111
99+ last_lsn = 15189350111
100+
101+ * :file:`xtrabackup_binlog_info`
102+ The binary log file used by the server and its position at the moment of the backup. Result of the :command:`SHOW MASTER STATUS`.
103+
104+ * :file:`xtrabackup_binlog_pos_innodb`
105+ The binary log file and its current position for |InnoDB| or |XtraDB| tables.
106+
107+ * :file:`xtrabackup_binary`
108+ The |xtrabackup| binary used in the process.
109+
110+ * :file:`xtrabackup_logfile`
111+ Contains data needed for running the: :option:`--apply-log`. The bigger this file is the :option:`--apply-log` process will take longer to finish.
112+
113+ * :file:`<table_name>.delta.meta`
114+ This file is going to be created when performing the incremental backup. It contains the per-table delta metadata: page size, size of compressed page (if the value is 0 it means the tablespace isn't compressed) and space id. Example of this file could looks like this: ::
115+
116+ page_size = 16384
117+ zip_size = 0
118+ space_id = 0
119+
120+* Information related to the replication environment (if using the :option:`--slave-info` option):
121+
122+ * :file:`xtrabackup_slave_info`
123+ The ``CHANGE MASTER`` statement needed for setting up a slave.
124+
125
126=== modified file 'innobackupex'
127--- innobackupex 2012-10-16 15:38:42 +0000
128+++ innobackupex 2012-10-24 18:52:21 +0000
129@@ -263,7 +263,7 @@
130 my $reason = `cat $mysql_stderr`;
131 $mysql_pid = '';
132 # Failed to connect to MySQL
133- die "Failed to connect to MySQL server to detect version.\nYou must set xtrabackup version to use with --ibbackup option.\nPossible values are xtrabackup_51 (for MySQL 5.0 and 5.1) or xtrabackup (for MySQL 5.1 with InnoDB plugin or Percona Server)\n";
134+ die "Failed to connect to MySQL server to detect version.\nYou must set xtrabackup version to use with --ibbackup option.\nPossible values are xtrabackup_51 (for MySQL 5.0 and 5.1), xtrabackup_55 (for MySQL 5.5) or xtrabackup (for MySQL 5.1 with InnoDB plugin or Percona Server)\n";
135 }
136 else{
137 mysql_close();

Subscribers

People subscribed via source and target branches