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

Proposed by Ignacio Nin on 2013-06-05
Status: Merged
Approved by: Laurynas Biveinis on 2013-06-06
Approved revision: 549
Merged at revision: 569
Proposed branch: lp:~ignacio-nin/percona-server/5.1-bug1181753
Merge into: lp:percona-server/5.1
Diff against target: 23 lines (+11/-2)
1 file modified
build/percona-server.spec (+11/-2)
To merge this branch: bzr merge lp:~ignacio-nin/percona-server/5.1-bug1181753
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) 2013-06-05 Approve on 2013-06-06
Review via email: mp+167581@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-05-23 09:09:56 +0000
3+++ build/percona-server.spec 2013-06-05 16:06:34 +0000
4@@ -584,8 +584,17 @@
5 if [ X${PERCONA_DEBUG} == X1 ]; then
6 set -x
7 fi
8-#
9-mysql_datadir=%{mysqldatadir}
10+
11+# There are users who deviate from the default file system layout.
12+# Check local settings to support them.
13+if [ -x %{_bindir}/my_print_defaults ]
14+then
15+ mysql_datadir=`%{_bindir}/my_print_defaults server mysqld | grep '^--datadir=' | sed -n 's/--datadir=//p'`
16+fi
17+if [ -z "$mysql_datadir" ]
18+then
19+ mysql_datadir=%{mysqldatadir}
20+fi
21
22 # ----------------------------------------------------------------------
23 # Make MySQL start/shutdown automatically when the machine does it.

Subscribers

People subscribed via source and target branches