Merge lp:~ignacio-nin/percona-server/5.1-bug1169522 into lp:percona-server/5.1

[Ignacio Nin]

Fix for bug #1169522. The way this was implemented is that mysql_install_db is not called if the $datadir/mysql directory exists. Also useless calls to mkdir for the mysql and test databases were removed.

[Laurynas Biveinis (laurynas-biveinis)]

review: Approve

=== modified file 'build/percona-server.spec'
--- build/percona-server.spec	2013-06-06 16:43:26 +0000
+++ build/percona-server.spec	2013-07-01 02:34:30 +0000
@@ -618,8 +618,14 @@
 # Initiate databases
 # ----------------------------------------------------------------------
 if [ $1 -eq 1 ]; then #clean installation
-        mkdir -p $mysql_datadir/{mysql,test}
+    # Does $mysql_datadir/mysql exist? In this case, this is probably an
+    # upgrade from a previous version or a reinstall. It's best not to
+    # call mysql_install_db in this case since the test db would be
+    # possibly recreated (bug #1169522).
+    if test ! -e $mysql_datadir/mysql
+    then
         %{_bindir}/mysql_install_db --rpm --user=%{mysqld_user}
+    fi
 fi
 # ----------------------------------------------------------------------
 # FIXME upgrade databases if needed would go here - but it cannot be