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

Proposed by Ignacio Nin
Status: Merged
Approved by: Laurynas Biveinis
Approved revision: no longer in the source branch.
Merged at revision: 408
Proposed branch: lp:~ignacio-nin/percona-server/5.6-bug1201036
Merge into: lp:percona-server/5.6
Diff against target: 30 lines (+3/-3)
1 file modified
build/percona-server.spec (+3/-3)
To merge this branch: bzr merge lp:~ignacio-nin/percona-server/5.6-bug1201036
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) Approve
Review via email: mp+177463@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Laurynas Biveinis (laurynas-biveinis) :
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-07-01 04:14:22 +0000
3+++ build/percona-server.spec 2013-07-29 19:54:55 +0000
4@@ -559,7 +559,7 @@
5 # Check local settings to support them.
6 if [ -x %{_bindir}/my_print_defaults ]
7 then
8- mysql_datadir=`%{_bindir}/my_print_defaults server mysqld | grep '^--datadir=' | sed -n 's/--datadir=//p'`
9+ mysql_datadir=`%{_bindir}/my_print_defaults server mysqld | grep '^--datadir=' | sed -n 's/--datadir=//p' | tail -n 1`
10 fi
11 if [ -z "$mysql_datadir" ]
12 then
13@@ -722,7 +722,7 @@
14 # Check local settings to support them.
15 if [ -x %{_bindir}/my_print_defaults ]
16 then
17- mysql_datadir=`%{_bindir}/my_print_defaults server mysqld | grep '^--datadir=' | sed -n 's/--datadir=//p'`
18+ mysql_datadir=`%{_bindir}/my_print_defaults server mysqld | grep '^--datadir=' | sed -n 's/--datadir=//p' | tail -n 1`
19 fi
20 if [ -z "$mysql_datadir" ]
21 then
22@@ -917,7 +917,7 @@
23 # Check local settings to support them.
24 if [ -x %{_bindir}/my_print_defaults ]
25 then
26- mysql_datadir=`%{_bindir}/my_print_defaults server mysqld | grep '^--datadir=' | sed -n 's/--datadir=//p'`
27+ mysql_datadir=`%{_bindir}/my_print_defaults server mysqld | grep '^--datadir=' | sed -n 's/--datadir=//p' | tail -n 1`
28 fi
29 if [ -z "$mysql_datadir" ]
30 then

Subscribers

People subscribed via source and target branches