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

Proposed by Ignacio Nin
Status: Merged
Approved by: Laurynas Biveinis
Approved revision: 379
Merged at revision: 379
Proposed branch: lp:~ignacio-nin/percona-server/5.6-bug1181753
Merge into: lp:percona-server/5.6
Diff against target: 67 lines (+32/-4)
1 file modified
build/percona-server.spec (+32/-4)
To merge this branch: bzr merge lp:~ignacio-nin/percona-server/5.6-bug1181753
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) Approve
Review via email: mp+167584@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-03 01:41:20 +0000
+++ build/percona-server.spec 2013-06-05 16:06:47 +0000
@@ -555,7 +555,16 @@
555555
556# ATTENTION: Parts of this are duplicated in the "triggerpostun" !556# ATTENTION: Parts of this are duplicated in the "triggerpostun" !
557557
558mysql_datadir=%{mysqldatadir}558# There are users who deviate from the default file system layout.
559# Check local settings to support them.
560if [ -x %{_bindir}/my_print_defaults ]
561then
562 mysql_datadir=`%{_bindir}/my_print_defaults server mysqld | grep '^--datadir=' | sed -n 's/--datadir=//p'`
563fi
564if [ -z "$mysql_datadir" ]
565then
566 mysql_datadir=%{mysqldatadir}
567fi
559# Check if we can safely upgrade. An upgrade is only safe if it's from one568# Check if we can safely upgrade. An upgrade is only safe if it's from one
560# of our RPMs in the same version family.569# of our RPMs in the same version family.
561570
@@ -709,7 +718,16 @@
709718
710# ATTENTION: Parts of this are duplicated in the "triggerpostun" !719# ATTENTION: Parts of this are duplicated in the "triggerpostun" !
711720
712mysql_datadir=%{mysqldatadir}721# There are users who deviate from the default file system layout.
722# Check local settings to support them.
723if [ -x %{_bindir}/my_print_defaults ]
724then
725 mysql_datadir=`%{_bindir}/my_print_defaults server mysqld | grep '^--datadir=' | sed -n 's/--datadir=//p'`
726fi
727if [ -z "$mysql_datadir" ]
728then
729 mysql_datadir=%{mysqldatadir}
730fi
713NEW_VERSION=%{mysql_version}-%{release}731NEW_VERSION=%{mysql_version}-%{release}
714STATUS_FILE=$mysql_datadir/RPM_UPGRADE_MARKER732STATUS_FILE=$mysql_datadir/RPM_UPGRADE_MARKER
715733
@@ -760,7 +778,8 @@
760# ----------------------------------------------------------------------778# ----------------------------------------------------------------------
761# Initiate databases if needed779# Initiate databases if needed
762# ----------------------------------------------------------------------780# ----------------------------------------------------------------------
763%{_bindir}/mysql_install_db --rpm --user=%{mysqld_user}781%{_bindir}/mysql_install_db --rpm --user=%{mysqld_user} \
782 --datadir=$mysql_datadir
764783
765# ----------------------------------------------------------------------784# ----------------------------------------------------------------------
766# Upgrade databases if needed would go here - but it cannot be automated yet785# Upgrade databases if needed would go here - but it cannot be automated yet
@@ -889,7 +908,16 @@
889# http://docs.fedoraproject.org/en-US/Fedora_Draft_Documentation/0.1/html/RPM_Guide/ch10s02.html908# http://docs.fedoraproject.org/en-US/Fedora_Draft_Documentation/0.1/html/RPM_Guide/ch10s02.html
890# For all details of this code, see the "pre" and "post" sections.909# For all details of this code, see the "pre" and "post" sections.
891910
892mysql_datadir=%{mysqldatadir}911# There are users who deviate from the default file system layout.
912# Check local settings to support them.
913if [ -x %{_bindir}/my_print_defaults ]
914then
915 mysql_datadir=`%{_bindir}/my_print_defaults server mysqld | grep '^--datadir=' | sed -n 's/--datadir=//p'`
916fi
917if [ -z "$mysql_datadir" ]
918then
919 mysql_datadir=%{mysqldatadir}
920fi
893NEW_VERSION=%{mysql_version}-%{release}921NEW_VERSION=%{mysql_version}-%{release}
894STATUS_FILE=$mysql_datadir/RPM_UPGRADE_MARKER-LAST # Note the difference!922STATUS_FILE=$mysql_datadir/RPM_UPGRADE_MARKER-LAST # Note the difference!
895STATUS_HISTORY=$mysql_datadir/RPM_UPGRADE_HISTORY923STATUS_HISTORY=$mysql_datadir/RPM_UPGRADE_HISTORY

Subscribers

People subscribed via source and target branches