Merge lp:~hrvojem/percona-xtradb-cluster/bug940520 into lp:~percona-dev/percona-xtradb-cluster/5.5.20

Proposed by Hrvoje Matijakovic on 2012-02-24
Status: Merged
Approved by: Vadim Tkachenko on 2012-02-24
Approved revision: 3724
Merged at revision: 3724
Proposed branch: lp:~hrvojem/percona-xtradb-cluster/bug940520
Merge into: lp:~percona-dev/percona-xtradb-cluster/5.5.20
Diff against target: 128 lines (+1/-96)
4 files modified
doc/source/index.rst (+1/-0)
doc/source/installation.rst (+0/-2)
doc/source/installation/apt_repo.rst (+0/-60)
doc/source/installation/bin_distro_specific.rst (+0/-34)
To merge this branch: bzr merge lp:~hrvojem/percona-xtradb-cluster/bug940520
Reviewer Review Type Date Requested Status
Vadim Tkachenko 2012-02-24 Approve on 2012-02-24
Review via email: mp+94605@code.launchpad.net
To post a comment you must log in.
Vadim Tkachenko (vadim-tk) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'doc/source/index.rst'
2--- doc/source/index.rst 2012-02-20 17:05:24 +0000
3+++ doc/source/index.rst 2012-02-24 18:53:22 +0000
4@@ -3,6 +3,7 @@
5 You can adapt this file completely to your liking, but it should at least
6 contain the root `toctree` directive.
7
8+==================================================
9 Welcome to Percona XtraDB Cluster's documentation!
10 ==================================================
11
12
13=== modified file 'doc/source/installation.rst'
14--- doc/source/installation.rst 2012-02-04 01:22:23 +0000
15+++ doc/source/installation.rst 2012-02-24 18:53:22 +0000
16@@ -5,8 +5,6 @@
17 .. toctree::
18 :hidden:
19
20- installation/bin_distro_specific
21-
22 Ready-to-use binaries are available from the *Percona XtraDB Cluster* `download page <http://www.percona.com/downloads/Percona-XtraDB-Cluster/>`_, including:
23
24 * ``RPM`` packages for *RHEL* 5 and *RHEL* 6
25
26=== removed file 'doc/source/installation/apt_repo.rst'
27--- doc/source/installation/apt_repo.rst 2012-02-04 01:22:23 +0000
28+++ doc/source/installation/apt_repo.rst 1970-01-01 00:00:00 +0000
29@@ -1,60 +0,0 @@
30-===================================
31- Percona :program:`apt` Repository
32-===================================
33-
34-*Debian* and *Ubuntu* packages from *Percona* are signed with a key. Before using the repository, you should add the key to :program:`apt`. To do that, run the following commands: ::
35-
36- $ gpg --keyserver hkp://keys.gnupg.net --recv-keys 1C4CBDCDCD2EFD2A
37- ... [some output removed] ...
38- gpg: imported: 1
39-
40- $ gpg -a --export CD2EFD2A | sudo apt-key add -
41-
42-Add this to :file:`/etc/apt/sources.list`, replacing ``lenny`` with the name of your distribution: ::
43-
44- deb http://repo.percona.com/apt lenny main
45- deb-src http://repo.percona.com/apt lenny main
46-
47-Remember to update the local cache: ::
48-
49- $ apt-get update
50-
51-Supported Platforms
52-===================
53-
54- * ``x86_64`` (also known as ``amd64``)
55-
56- * ``i386``
57-
58- * ``i686``
59-
60-Supported Releases
61-==================
62-
63-Debian
64-------
65-
66- * ``lenny``
67-
68- * ``squeeze``
69-
70-Ubuntu
71-------
72-
73- * ``hardy``
74-
75- * ``lucid``
76-
77- * ``maverick``
78-
79-
80-.. note:: ``natty`` users should use ``maverick`` in :file:`/etc/apt/sources.list`.
81-
82-
83-Release Candidate Repository
84-============================
85-
86-To subscribe to the release candidate repository, add two lines to the :file:`/etc/apt/sources.list` file, again replacing ``lenny`` with your server's release version: ::
87-
88- deb http://repo.percona.com/apt-rc lenny main
89- deb-src http://repo.percona.com/apt-rc lenny main
90
91=== removed file 'doc/source/installation/bin_distro_specific.rst'
92--- doc/source/installation/bin_distro_specific.rst 2012-02-04 01:22:23 +0000
93+++ doc/source/installation/bin_distro_specific.rst 1970-01-01 00:00:00 +0000
94@@ -1,34 +0,0 @@
95-==========================================
96- Distribution-specific installation notes
97-==========================================
98-
99-SUSE 11
100-=======
101-
102-Although there is no specific build for SUSE, the build for RHEL is suitable for this distribution.
103-
104-* Download the RPM package of |XtraBackup| for your architecture at http://www.percona.com/downloads/XtraBackup/LATEST/
105-
106-* Copy to a directory (like /tmp) and extract the RPM: ::
107-
108- rpm2cpio xtrabackup-1.5-9.rhel5.$ARCH.rpm | cpio -idmv
109-
110-* Copy binaries to /usr/bin: ::
111-
112- cp ./usr/bin/xtrabackup_55 /usr/bin
113- cp ./usr/bin/tar4ibd /usr/bin
114- cp ./usr/bin/innobackupex-1.5.1 /usr/bin
115-
116-* If you use a version prior to 1.6, the stock perl causes an issue with the backup scripts version detection. Edit :file:`/usr/bin/innobackupex-1.5.1`. Comment out the lines below as shown below: ::
117-
118- $perl_version = chr($required_perl_version[0])
119- . chr($required_perl_version[1])
120- . chr($required_perl_version[2]);
121- #if ($^V lt $perl_version) {
122- #my $version = chr(48 + $required_perl_version[0])
123- # . "." . chr(48 + $required_perl_version[1])
124- # . "." . chr(48 + $required_perl_version[2]);
125- #print STDERR "$prefix Warning: " .
126- # "Your perl is too old! Innobackup requires\n";
127- #print STDERR "$prefix Warning: perl $version or newer!\n";
128- #}

Subscribers

People subscribed via source and target branches