Merge lp:~hrvojem/percona-xtradb-cluster/bug1292534-5.5 into lp:percona-xtradb-cluster/5.5

[Hrvoje Matijakovic]

[Raghavendra D Prabhu (raghavendra-prabhu)]

Added the change.

=== modified file 'doc-pxc/source/installation.rst'
--- doc-pxc/source/installation.rst	2014-05-08 16:52:49 +0000
+++ doc-pxc/source/installation.rst	2014-09-05 12:33:33 +0000
@@ -37,6 +37,10 @@
 
 More detailed example of the |Percona XtraDB Cluster| installation and configuration can be seen in :ref:`centos_howto` tutorial.
 
+.. note:: 
+
+   In *CentOS* 5 ``mysql`` package (a dependency of ``perl-DBD-MySQL`` for ``libmysqlclient.so.15``) conflicts with ``Percona-XtraDB-Cluster-client-55.x86_64`` package. To avoid this, install ``Percona-Server-shared-compat-51`` first and then proceed to install |Percona XtraDB Cluster| with ``yum install Percona-XtraDB-Cluster-55``.  Also, in case, ``mysql`` package was installed,  you will need to remove the it before installing |Percona XtraDB Cluster| as mentioned before.
+
 ``DEB``-Based Systems
 ---------------------
 
 
=== modified file 'doc-pxc/source/installation/yum_repo.rst'
--- doc-pxc/source/installation/yum_repo.rst	2014-05-08 07:51:46 +0000
+++ doc-pxc/source/installation/yum_repo.rst	2014-09-05 12:33:33 +0000
@@ -25,6 +25,11 @@
 
 The RPMs for the automatic installation are available at http://www.percona.com/downloads/percona-release/ and include source code.
 
+Resolving package conflicts
+===========================
+
+In *CentOS* 5 ``mysql`` package (a dependency of ``perl-DBD-MySQL`` for ``libmysqlclient.so.15``) conflicts with ``Percona-XtraDB-Cluster-client-55.x86_64`` package. To avoid this, install ``Percona-Server-shared-compat-51`` first and then proceed to install |Percona XtraDB Cluster| with ``yum install Percona-XtraDB-Cluster-55``.  Also, in case, ``mysql`` package was installed,  you will need to remove the it before installing |Percona XtraDB Cluster| as mentioned before
+
 Install XtraDB Cluster
 =======================