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

Proposed by Aleksandr Kuzminsky
Status: Merged
Approved by: Vadim Tkachenko
Approved revision: no longer in the source branch.
Merged at revision: 41
Proposed branch: lp:~percona-dev/percona-server/release-5.1.47-11-mysql-test
Merge into: lp:percona-server/release-5.1.47-12
Diff against target: 39 lines (+3/-5)
1 file modified
build/percona-server.spec (+3/-5)
To merge this branch: bzr merge lp:~percona-dev/percona-server/release-5.1.47-11-mysql-test
Reviewer Review Type Date Requested Status
Percona developers Pending
Review via email: mp+27648@code.launchpad.net

Description of the change

To post a comment you must log in.
Revision history for this message
Vadim Tkachenko (vadim-tk) wrote :

please push to -12 release branch also

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
117%define lic_files COPYING README117%define lic_files COPYING README
118%define src_dir Percona-Server118%define src_dir Percona-Server
119119
120Source1: Percona-Server.tar.gz
121
122##############################################################################120##############################################################################
123# Main spec file section121# Main spec file section
124##############################################################################122##############################################################################
@@ -281,7 +279,7 @@
281 --with-mysqld-user=%{mysqld_user} \279 --with-mysqld-user=%{mysqld_user} \
282 --with-unix-socket-path=/var/lib/mysql/mysql.sock \280 --with-unix-socket-path=/var/lib/mysql/mysql.sock \
283 --with-pic \281 --with-pic \
284 --prefix=/ \282 -prefix=/usr \
285 --with-extra-charsets=complex \283 --with-extra-charsets=complex \
286%if %{YASSL_BUILD}284%if %{YASSL_BUILD}
287 --with-ssl \285 --with-ssl \
@@ -417,7 +415,7 @@
417# Ensure that needed directories exists415# Ensure that needed directories exists
418install -d $RBR%{_sysconfdir}/{logrotate.d,init.d}416install -d $RBR%{_sysconfdir}/{logrotate.d,init.d}
419install -d $RBR%{mysqldatadir}/mysql417install -d $RBR%{mysqldatadir}/mysql
420install -d $RBR%{_datadir}/mysql-test418install -d $RBR/mysql-test
421install -d $RBR%{_datadir}/mysql/SELinux/RHEL4419install -d $RBR%{_datadir}/mysql/SELinux/RHEL4
422install -d $RBR%{_includedir}420install -d $RBR%{_includedir}
423install -d $RBR%{_libdir}421install -d $RBR%{_libdir}
@@ -804,7 +802,7 @@
804802
805%files -n Percona-Server-test%{package_suffix}803%files -n Percona-Server-test%{package_suffix}
806%defattr(-, root, root, 0755)804%defattr(-, root, root, 0755)
807%{_datadir}/mysql-test805/usr/mysql-test/*
808%attr(755, root, root) %{_bindir}/mysql_client_test806%attr(755, root, root) %{_bindir}/mysql_client_test
809%doc %attr(644, root, man) %{_mandir}/man1/mysql_client_test.1*807%doc %attr(644, root, man) %{_mandir}/man1/mysql_client_test.1*
810%doc %attr(644, root, man) %{_mandir}/man1/mysql-stress-test.pl.1*808%doc %attr(644, root, man) %{_mandir}/man1/mysql-stress-test.pl.1*

Subscribers

People subscribed via source and target branches

to all changes: