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

[Ignacio Nin]

[Laurynas Biveinis (laurynas-biveinis)]

review: Approve

=== modified file 'build/percona-server.spec'
--- build/percona-server.spec	2013-05-23 09:09:56 +0000
+++ build/percona-server.spec	2013-06-05 16:06:34 +0000
@@ -584,8 +584,17 @@
 if [ X${PERCONA_DEBUG} == X1 ]; then
         set -x
 fi
-#
-mysql_datadir=%{mysqldatadir}
+
+# There are users who deviate from the default file system layout.
+# Check local settings to support them.
+if [ -x %{_bindir}/my_print_defaults ]
+then
+  mysql_datadir=`%{_bindir}/my_print_defaults server mysqld | grep '^--datadir=' | sed -n 's/--datadir=//p'`
+fi
+if [ -z "$mysql_datadir" ]
+then
+  mysql_datadir=%{mysqldatadir}
+fi
 
 # ----------------------------------------------------------------------
 # Make MySQL start/shutdown automatically when the machine does it.