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

Proposed by Ignacio Nin
Status: Merged
Approved by: Laurynas Biveinis
Approved revision: 500
Merged at revision: 533
Proposed branch: lp:~ignacio-nin/percona-server/5.5-bug1181753
Merge into: lp:percona-server/5.5
Diff against target: 57 lines (+30/-3)
1 file modified
build/percona-server.spec (+30/-3)
To merge this branch: bzr merge lp:~ignacio-nin/percona-server/5.5-bug1181753
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) Approve
Review via email: mp+167583@code.launchpad.net
To post a comment you must log in.
review: Approve

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 2013-06-01 15:04:43 +0000
+++ build/percona-server.spec 2013-06-05 16:06:40 +0000
@@ -563,7 +563,16 @@
563563
564# ATTENTION: Parts of this are duplicated in the "triggerpostun" !564# ATTENTION: Parts of this are duplicated in the "triggerpostun" !
565565
566mysql_datadir=%{mysqldatadir}566# There are users who deviate from the default file system layout.
567# Check local settings to support them.
568if [ -x %{_bindir}/my_print_defaults ]
569then
570 mysql_datadir=`%{_bindir}/my_print_defaults server mysqld | grep '^--datadir=' | sed -n 's/--datadir=//p'`
571fi
572if [ -z "$mysql_datadir" ]
573then
574 mysql_datadir=%{mysqldatadir}
575fi
567# Check if we can safely upgrade. An upgrade is only safe if it's from one576# Check if we can safely upgrade. An upgrade is only safe if it's from one
568# of our RPMs in the same version family.577# of our RPMs in the same version family.
569578
@@ -719,7 +728,16 @@
719fi728fi
720# ATTENTION: Parts of this are duplicated in the "triggerpostun" !729# ATTENTION: Parts of this are duplicated in the "triggerpostun" !
721730
722mysql_datadir=%{mysqldatadir}731# There are users who deviate from the default file system layout.
732# Check local settings to support them.
733if [ -x %{_bindir}/my_print_defaults ]
734then
735 mysql_datadir=`%{_bindir}/my_print_defaults server mysqld | grep '^--datadir=' | sed -n 's/--datadir=//p'`
736fi
737if [ -z "$mysql_datadir" ]
738then
739 mysql_datadir=%{mysqldatadir}
740fi
723NEW_VERSION=%{mysql_version}-%{release}741NEW_VERSION=%{mysql_version}-%{release}
724STATUS_FILE=$mysql_datadir/RPM_UPGRADE_MARKER742STATUS_FILE=$mysql_datadir/RPM_UPGRADE_MARKER
725743
@@ -904,7 +922,16 @@
904# http://docs.fedoraproject.org/en-US/Fedora_Draft_Documentation/0.1/html/RPM_Guide/ch10s02.html922# http://docs.fedoraproject.org/en-US/Fedora_Draft_Documentation/0.1/html/RPM_Guide/ch10s02.html
905# For all details of this code, see the "pre" and "post" sections.923# For all details of this code, see the "pre" and "post" sections.
906924
907mysql_datadir=%{mysqldatadir}925# There are users who deviate from the default file system layout.
926# Check local settings to support them.
927if [ -x %{_bindir}/my_print_defaults ]
928then
929 mysql_datadir=`%{_bindir}/my_print_defaults server mysqld | grep '^--datadir=' | sed -n 's/--datadir=//p'`
930fi
931if [ -z "$mysql_datadir" ]
932then
933 mysql_datadir=%{mysqldatadir}
934fi
908NEW_VERSION=%{mysql_version}-%{release}935NEW_VERSION=%{mysql_version}-%{release}
909STATUS_FILE=$mysql_datadir/RPM_UPGRADE_MARKER-LAST # Note the difference!936STATUS_FILE=$mysql_datadir/RPM_UPGRADE_MARKER-LAST # Note the difference!
910STATUS_HISTORY=$mysql_datadir/RPM_UPGRADE_HISTORY937STATUS_HISTORY=$mysql_datadir/RPM_UPGRADE_HISTORY

Subscribers

People subscribed via source and target branches