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

Proposed by Ignacio Nin on 2013-05-15
Status: Merged
Approved by: Laurynas Biveinis on 2013-05-16
Approved revision: 503
Merged at revision: 512
Proposed branch: lp:~ignacio-nin/percona-server/5.5-bug1174426
Merge into: lp:percona-server/5.5
Diff against target: 47 lines (+16/-14)
1 file modified
build/percona-server.spec (+16/-14)
To merge this branch: bzr merge lp:~ignacio-nin/percona-server/5.5-bug1174426
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) 2013-05-15 Approve on 2013-05-16
Review via email: mp+163907@code.launchpad.net

Description of the change

Fixes for bugs lp:1170024 and lp:1174426.

This is a merge for 5.5 branch only (see comment at https://code.launchpad.net/~abychko/percona-server/bug1170024-5.5/+merge/159454/comments/361415).

The disadvantages for rebasing would be that it would be needed to rebase on revno 472 (460 is the GCA), but also that releases have been made particularly with the fix for lp:1170024.

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-04-23 06:02:56 +0000
3+++ build/percona-server.spec 2013-05-15 12:50:56 +0000
4@@ -744,20 +744,6 @@
5 if [ ! -d $mysql_datadir/test ]; then
6 mkdir $mysql_datadir/test;
7 fi
8-%{_bindir}/mysql_install_db --rpm --user=%{mysqld_user}
9-fi
10-# ----------------------------------------------------------------------
11-# Make MySQL start/shutdown automatically when the machine does it.
12-# ----------------------------------------------------------------------
13-# NOTE: This still needs to be debated. Should we check whether these links
14-# for the other run levels exist(ed) before the upgrade?
15-# use chkconfig on Enterprise Linux and newer SuSE releases
16-if [ -x /sbin/chkconfig ] ; then
17- /sbin/chkconfig --add mysql
18-# use insserv for older SuSE Linux versions
19-elif [ -x /sbin/insserv ] ; then
20- /sbin/insserv %{_sysconfdir}/init.d/mysql
21-fi
22
23 # ----------------------------------------------------------------------
24 # Create a MySQL user and group. Do not report any problems if it already
25@@ -773,6 +759,22 @@
26 # ----------------------------------------------------------------------
27 # Initiate databases if needed
28 # ----------------------------------------------------------------------
29+%{_bindir}/mysql_install_db --rpm --user=%{mysqld_user}
30+fi
31+
32+# ----------------------------------------------------------------------
33+# Make MySQL start/shutdown automatically when the machine does it.
34+# ----------------------------------------------------------------------
35+# NOTE: This still needs to be debated. Should we check whether these links
36+# for the other run levels exist(ed) before the upgrade?
37+# use chkconfig on Enterprise Linux and newer SuSE releases
38+if [ -x /sbin/chkconfig ] ; then
39+ /sbin/chkconfig --add mysql
40+# use insserv for older SuSE Linux versions
41+elif [ -x /sbin/insserv ] ; then
42+ /sbin/insserv %{_sysconfdir}/init.d/mysql
43+fi
44+
45 # ----------------------------------------------------------------------
46 # Upgrade databases if needed would go here - but it cannot be automated yet
47 # ----------------------------------------------------------------------

Subscribers

People subscribed via source and target branches