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
1=== modified file 'build/percona-server.spec'
2--- build/percona-server.spec 2013-06-01 15:04:43 +0000
3+++ build/percona-server.spec 2013-06-05 16:06:40 +0000
4@@ -563,7 +563,16 @@
5
6 # ATTENTION: Parts of this are duplicated in the "triggerpostun" !
7
8-mysql_datadir=%{mysqldatadir}
9+# There are users who deviate from the default file system layout.
10+# Check local settings to support them.
11+if [ -x %{_bindir}/my_print_defaults ]
12+then
13+ mysql_datadir=`%{_bindir}/my_print_defaults server mysqld | grep '^--datadir=' | sed -n 's/--datadir=//p'`
14+fi
15+if [ -z "$mysql_datadir" ]
16+then
17+ mysql_datadir=%{mysqldatadir}
18+fi
19 # Check if we can safely upgrade. An upgrade is only safe if it's from one
20 # of our RPMs in the same version family.
21
22@@ -719,7 +728,16 @@
23 fi
24 # ATTENTION: Parts of this are duplicated in the "triggerpostun" !
25
26-mysql_datadir=%{mysqldatadir}
27+# There are users who deviate from the default file system layout.
28+# Check local settings to support them.
29+if [ -x %{_bindir}/my_print_defaults ]
30+then
31+ mysql_datadir=`%{_bindir}/my_print_defaults server mysqld | grep '^--datadir=' | sed -n 's/--datadir=//p'`
32+fi
33+if [ -z "$mysql_datadir" ]
34+then
35+ mysql_datadir=%{mysqldatadir}
36+fi
37 NEW_VERSION=%{mysql_version}-%{release}
38 STATUS_FILE=$mysql_datadir/RPM_UPGRADE_MARKER
39
40@@ -904,7 +922,16 @@
41 # http://docs.fedoraproject.org/en-US/Fedora_Draft_Documentation/0.1/html/RPM_Guide/ch10s02.html
42 # For all details of this code, see the "pre" and "post" sections.
43
44-mysql_datadir=%{mysqldatadir}
45+# There are users who deviate from the default file system layout.
46+# Check local settings to support them.
47+if [ -x %{_bindir}/my_print_defaults ]
48+then
49+ mysql_datadir=`%{_bindir}/my_print_defaults server mysqld | grep '^--datadir=' | sed -n 's/--datadir=//p'`
50+fi
51+if [ -z "$mysql_datadir" ]
52+then
53+ mysql_datadir=%{mysqldatadir}
54+fi
55 NEW_VERSION=%{mysql_version}-%{release}
56 STATUS_FILE=$mysql_datadir/RPM_UPGRADE_MARKER-LAST # Note the difference!
57 STATUS_HISTORY=$mysql_datadir/RPM_UPGRADE_HISTORY

Subscribers

People subscribed via source and target branches