1
=== modified file 'build-ps/percona-server.spec'
2
--- build-ps/percona-server.spec	2015-01-13 14:38:41 +0000
3
+++ build-ps/percona-server.spec	2015-01-19 14:55:22 +0000
4
@@ -951,7 +951,10 @@
5
951
# For systemd check postun
951
# For systemd check postun
6
952
%if 0%{?systemd} == 0
952
%if 0%{?systemd} == 0
7
953
# Was the server running before the upgrade? If so, restart the new one.
953
# Was the server running before the upgrade? If so, restart the new one.
9
954
if [ "$SERVER_TO_START" = "true" ] ; then
954
# Don't start it if TokuDB package is installed - it will be started
10
955
# after TokuDB package is upgraded - prevents TokuDB init error
11
956
tokudb_installed=`rpm -q Percona-Server-tokudb-56 2>/dev/null`
12
957
if [ $? -eq 1 -a "$SERVER_TO_START" = "true" ] ; then
13
955
	# Restart in the same way that mysqld will be started normally.
958
	# Restart in the same way that mysqld will be started normally.
14
956
	if [ -x %{_sysconfdir}/init.d/mysql ] ; then
959
	if [ -x %{_sysconfdir}/init.d/mysql ] ; then
15
957
		%{_sysconfdir}/init.d/mysql start
960
		%{_sysconfdir}/init.d/mysql start
16
@@ -974,7 +977,7 @@
17
974
echo "====="                                     >> $STATUS_FILE
977
echo "====="                                     >> $STATUS_FILE
18
975
STATUS_HISTORY=$mysql_datadir/RPM_UPGRADE_HISTORY
978
STATUS_HISTORY=$mysql_datadir/RPM_UPGRADE_HISTORY
19
976
cat $STATUS_FILE >> $STATUS_HISTORY
979
cat $STATUS_FILE >> $STATUS_HISTORY
21
977
mv -f  $STATUS_FILE ${STATUS_FILE}-LAST  # for "triggerpostun"
980
mv -f  $STATUS_FILE ${STATUS_FILE}-LAST  # for "triggerpostun" and TokuDB package
22
978
981
23
979
982
24
980
#echo "Thank you for installing the MySQL Community Server! For Production
983
#echo "Thank you for installing the MySQL Community Server! For Production
25
@@ -1109,6 +1112,40 @@
26
1109
	echo "* See http://www.percona.com/doc/percona-server/5.6/tokudb/tokudb_intro.html for more details"
1112
	echo "* See http://www.percona.com/doc/percona-server/5.6/tokudb/tokudb_intro.html for more details"
27
1110
	echo ""
1113
	echo ""
28
1111
fi
1114
fi
29
1115
# If upgrade is in question and the server was started before upgrade we need to start it
30
1116
# after upgrading TokuDB package and not before because TokuDB will fail on init
31
1117
%if 0%{?systemd} == 0
32
1118
if [ $1 -eq 2 ]; then
33
1119
	# There are users who deviate from the default file system layout.
34
1120
	# Check local settings to support them.
35
1121
	if [ -x %{_bindir}/my_print_defaults ]
36
1122
	then
37
1123
	  mysql_datadir=`%{_bindir}/my_print_defaults server mysqld | grep '^--datadir=' | sed -n 's/--datadir=//p' | tail -n 1`
38
1124
	fi
39
1125
	if [ -z "$mysql_datadir" ]
40
1126
	then
41
1127
	  mysql_datadir=%{mysqldatadir}
42
1128
	fi
43
1129
44
1130
	STATUS_FILE=$mysql_datadir/RPM_UPGRADE_MARKER-LAST
45
1131
46
1132
	if [ -f $STATUS_FILE ] ; then
47
1133
	  SERVER_TO_START=`grep '^SERVER_TO_START=' $STATUS_FILE | cut -c17-`
48
1134
	else
49
1135
	  SERVER_TO_START=''
50
1136
	fi
51
1137
52
1138
	# Was the server running before the upgrade? If so, restart the new one.
53
1139
	if [ "$SERVER_TO_START" = "true" ] ; then 
54
1140
	  # Restart in the same way that mysqld will be started normally.
55
1141
	  if [ -x %{_sysconfdir}/init.d/mysql ] ; then 
56
1142
	    %{_sysconfdir}/init.d/mysql start
57
1143
	    echo "Giving mysqld 5 seconds to start"
58
1144
	    sleep 5
59
1145
	  fi
60
1146
	fi
61
1147
fi
62
1148
%endif
63
1112
# ----------------------------------------------------------------------------
1149
# ----------------------------------------------------------------------------
64
1113
%endif
1150
%endif
65
1114
1151
Reviewer	Review Type	Date Requested	Status
Laurynas Biveinis (community)		2015-01-19	Approve on 2015-01-23
Review via email: mp+246905@code.launchpad.net