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
1=== modified file 'doc/source/3nodesec2.rst'
2--- doc/source/3nodesec2.rst 2012-02-04 01:22:23 +0000
3+++ doc/source/3nodesec2.rst 2012-04-21 07:20:24 +0000
4@@ -19,7 +19,7 @@
5 3. Create data directories: ::
6
7 mkdir -p /mnt/data
8- mysql_install_db --datadir=/mnt/data
9+ mysql_install_db --datadir=/mnt/data --user=mysql
10
11 4. Stop firewall. Cluster requires couple TCP ports to operate. Easiest way: ::
12
13@@ -142,7 +142,7 @@
14
15 7. Connect to database on any node and create database: ::
16
17- mysql
18+ $ mysql -uroot
19 > CREATE DATABASE hello_tom;
20
21 The new database will be propagated to all nodes.
22
23=== modified file 'doc/source/installation/apt_repo.rst'
24--- doc/source/installation/apt_repo.rst 2012-04-03 12:00:52 +0000
25+++ doc/source/installation/apt_repo.rst 2012-04-21 07:20:24 +0000
26@@ -10,10 +10,10 @@
27
28 $ gpg -a --export CD2EFD2A | sudo apt-key add -
29
30-Add this to :file:`/etc/apt/sources.list`, replacing ``squeeze`` with the name of your distribution: ::
31+Add this to :file:`/etc/apt/sources.list`, replacing ``VERSION`` with the name of your distribution: ::
32
33- deb http://repo.percona.com/apt squeeze main
34- deb-src http://repo.percona.com/apt squeeze main
35+ deb http://repo.percona.com/apt VERSION main
36+ deb-src http://repo.percona.com/apt VERSION main
37
38 Remember to update the local cache: ::
39
40@@ -51,7 +51,7 @@
41 Percona `apt` Experimental repository
42 =====================================
43
44-Percona 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: ::
45+Percona 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: ::
46
47- deb http://repo.percona.com/apt squeeze main experimental
48- deb-src http://repo.percona.com/apt squeeze main experimental
49+ deb http://repo.percona.com/apt VERSION main experimental
50+ deb-src http://repo.percona.com/apt VERSION main experimental
51
52=== modified file 'doc/source/singlebox.rst'
53--- doc/source/singlebox.rst 2012-02-04 01:22:23 +0000
54+++ doc/source/singlebox.rst 2012-04-21 07:20:24 +0000
55@@ -90,6 +90,8 @@
56 innodb_locks_unsafe_for_binlog=1
57 innodb_autoinc_lock_mode=2
58
59+First 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.
60+
61 Configuration files (/etc/my.5000.cnf). PLEASE see the difference in *wsrep_cluster_address*: ::
62
63 /etc/my.5000.cnf

Subscribers

People subscribed via source and target branches