Merge lp:~abychko/percona-server/bug710799-5.1 into lp:percona-server/5.1

[Alexey Bychko]

[-] disabled uncongitional manual creation of /var/lib/mysql/*
[+] added conditional call of mysql_install_db, only for clean installation, but not for upgrade
[+] added debug possibility for %post

[Alexey Kopytov (akopytov)]

I see many unmerged revisions between lp:~abychko/percona-server/bug710799-5.1 and lp:~abychko/percona-server/bug710799 (including the fix itself).

The 5.1 fix should be rebased on current 5.1 and then upmerged to 5.5.

review: Needs Fixing

[Alexey Kopytov (akopytov)]

review: Approve

=== modified file 'build/percona-server.spec'
--- build/percona-server.spec	2013-01-18 03:33:06 +0000
+++ build/percona-server.spec	2013-03-07 12:50:27 +0000
@@ -577,20 +577,19 @@
 fi
 
 %post -n Percona-Server-server%{package_suffix}
+if [ X${PERCONA_DEBUG} == X1 ]; then
+        set -x
+fi
+#
 mysql_datadir=%{mysqldatadir}
 
 # ----------------------------------------------------------------------
-# Create data directory
-# ----------------------------------------------------------------------
-mkdir -p $mysql_datadir/{mysql,test}
-
-# ----------------------------------------------------------------------
 # Make MySQL start/shutdown automatically when the machine does it.
 # ----------------------------------------------------------------------
 if [ -x /sbin/chkconfig ] ; then
 	/sbin/chkconfig --add mysql
 fi
-
+#
 # ----------------------------------------------------------------------
 # Create a MySQL user and group. Do not report any problems if it already
 # exists.
@@ -601,16 +600,12 @@
 usermod -g %{mysqld_group} %{mysqld_user} 2> /dev/null || true
 
 # ----------------------------------------------------------------------
-# Change permissions so that the user that will run the MySQL daemon
-# owns all database files.
-# ----------------------------------------------------------------------
-chown -R %{mysqld_user}:%{mysqld_group} $mysql_datadir
-
-# ----------------------------------------------------------------------
 # Initiate databases
 # ----------------------------------------------------------------------
-%{_bindir}/mysql_install_db --rpm --user=%{mysqld_user}
-
+if [ $1 -eq 1 ]; then #clean installation
+        mkdir -p $mysql_datadir/{mysql,test}
+        %{_bindir}/mysql_install_db --rpm --user=%{mysqld_user}
+fi
 # ----------------------------------------------------------------------
 # FIXME upgrade databases if needed would go here - but it cannot be
 # automated yet