Merge lp:~percona-dev/percona-server/release-5.1.47-11-mysql-test into lp:percona-server/release-5.1.47-12

[Aleksandr Kuzminsky]

Fixed Bug #594317

[Vadim Tkachenko (vadim-tk)]

please push to -12 release branch also

=== modified file 'build/percona-server.spec'
--- build/percona-server.spec	2010-06-04 04:39:50 +0000
+++ build/percona-server.spec	2010-06-15 17:57:27 +0000
@@ -117,8 +117,6 @@
 %define lic_files COPYING README
 %define src_dir Percona-Server
 
-Source1: Percona-Server.tar.gz
-
 ##############################################################################
 # Main spec file section
 ##############################################################################
@@ -281,7 +279,7 @@
             --with-mysqld-user=%{mysqld_user} \
             --with-unix-socket-path=/var/lib/mysql/mysql.sock \
 	    --with-pic \
-            --prefix=/ \
+            -prefix=/usr \
 	    --with-extra-charsets=complex \
 %if %{YASSL_BUILD}
 	    --with-ssl \
@@ -417,7 +415,7 @@
 # Ensure that needed directories exists
 install -d $RBR%{_sysconfdir}/{logrotate.d,init.d}
 install -d $RBR%{mysqldatadir}/mysql
-install -d $RBR%{_datadir}/mysql-test
+install -d $RBR/mysql-test
 install -d $RBR%{_datadir}/mysql/SELinux/RHEL4
 install -d $RBR%{_includedir}
 install -d $RBR%{_libdir}
@@ -804,7 +802,7 @@
 
 %files -n Percona-Server-test%{package_suffix}
 %defattr(-, root, root, 0755)
-%{_datadir}/mysql-test
+/usr/mysql-test/*
 %attr(755, root, root) %{_bindir}/mysql_client_test
 %doc %attr(644, root, man) %{_mandir}/man1/mysql_client_test.1*
 %doc %attr(644, root, man) %{_mandir}/man1/mysql-stress-test.pl.1*