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

Proposed by Hrvoje Matijakovic
Status: Merged
Approved by: Hrvoje Matijakovic
Approved revision: 3753
Merged at revision: 3755
Proposed branch: lp:~hrvojem/percona-xtradb-cluster/bug978224
Merge into: lp:~percona-dev/percona-xtradb-cluster/5.5.20
Diff against target: 63 lines (+10/-8)
3 files modified
doc/source/3nodesec2.rst (+2/-2)
doc/source/installation/apt_repo.rst (+6/-6)
doc/source/singlebox.rst (+2/-0)
To merge this branch: bzr merge lp:~hrvojem/percona-xtradb-cluster/bug978224
Reviewer Review Type Date Requested Status
Vadim Tkachenko Pending
Review via email: mp+101559@code.launchpad.net
To post a comment you must log in.
3753. By Hrvoje Matijakovic

* bugfixes for: Bug #978224, Bug #978202, Bug #977739

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'doc/source/3nodesec2.rst'
--- doc/source/3nodesec2.rst 2012-02-04 01:22:23 +0000
+++ doc/source/3nodesec2.rst 2012-04-21 07:20:24 +0000
@@ -19,7 +19,7 @@
193. Create data directories: ::193. Create data directories: ::
2020
21 mkdir -p /mnt/data21 mkdir -p /mnt/data
22 mysql_install_db --datadir=/mnt/data22 mysql_install_db --datadir=/mnt/data --user=mysql
2323
244. Stop firewall. Cluster requires couple TCP ports to operate. Easiest way: :: 244. Stop firewall. Cluster requires couple TCP ports to operate. Easiest way: ::
2525
@@ -142,7 +142,7 @@
142142
1437. Connect to database on any node and create database: ::1437. Connect to database on any node and create database: ::
144144
145 mysql145 $ mysql -uroot
146 > CREATE DATABASE hello_tom;146 > CREATE DATABASE hello_tom;
147147
148The new database will be propagated to all nodes.148The new database will be propagated to all nodes.
149149
=== modified file 'doc/source/installation/apt_repo.rst'
--- doc/source/installation/apt_repo.rst 2012-04-03 12:00:52 +0000
+++ doc/source/installation/apt_repo.rst 2012-04-21 07:20:24 +0000
@@ -10,10 +10,10 @@
10 10
11 $ gpg -a --export CD2EFD2A | sudo apt-key add -11 $ gpg -a --export CD2EFD2A | sudo apt-key add -
1212
13Add this to :file:`/etc/apt/sources.list`, replacing ``squeeze`` with the name of your distribution: ::13Add this to :file:`/etc/apt/sources.list`, replacing ``VERSION`` with the name of your distribution: ::
1414
15 deb http://repo.percona.com/apt squeeze main 15 deb http://repo.percona.com/apt VERSION main
16 deb-src http://repo.percona.com/apt squeeze main16 deb-src http://repo.percona.com/apt VERSION main
1717
18Remember to update the local cache: ::18Remember to update the local cache: ::
1919
@@ -51,7 +51,7 @@
51Percona `apt` Experimental repository51Percona `apt` Experimental repository
52=====================================52=====================================
5353
54Percona offers fresh beta builds from the experimental repository. To enable it add the following lines to your :file:`/etc/apt/sources.list` , replacing ``squeeze`` with the name of your distribution: ::54Percona offers fresh beta builds from the experimental repository. To enable it add the following lines to your :file:`/etc/apt/sources.list` , replacing ``VERSION`` with the name of your distribution: ::
5555
56 deb http://repo.percona.com/apt squeeze main experimental56 deb http://repo.percona.com/apt VERSION main experimental
57 deb-src http://repo.percona.com/apt squeeze main experimental57 deb-src http://repo.percona.com/apt VERSION main experimental
5858
=== modified file 'doc/source/singlebox.rst'
--- doc/source/singlebox.rst 2012-02-04 01:22:23 +0000
+++ doc/source/singlebox.rst 2012-04-21 07:20:24 +0000
@@ -90,6 +90,8 @@
90 innodb_locks_unsafe_for_binlog=190 innodb_locks_unsafe_for_binlog=1
91 innodb_autoinc_lock_mode=291 innodb_autoinc_lock_mode=2
9292
93First node in the cluster has no IP parameter in wsrep_cluster_address because at that point in time there aren't any other servers in the cluster that this node can be connected to. Once you have a cluster running and you want to add/reconnect another node to it, you then supply an address of one of the cluster members in the cluster address.
94
93Configuration files (/etc/my.5000.cnf). PLEASE see the difference in *wsrep_cluster_address*: ::95Configuration files (/etc/my.5000.cnf). PLEASE see the difference in *wsrep_cluster_address*: ::
9496
95 /etc/my.5000.cnf97 /etc/my.5000.cnf

Subscribers

People subscribed via source and target branches