diff options
| author | unknown <tim@threads.polyesthetic.msg> | 2001-04-14 13:04:20 -0400 |
|---|---|---|
| committer | unknown <tim@threads.polyesthetic.msg> | 2001-04-14 13:04:20 -0400 |
| commit | 7cabdf0446534e40e9fac0625dda0d5d4ea21a5b (patch) | |
| tree | 515ac8c5735717e0710952c11274a7169667cd2d /support-files | |
| parent | 46decdde430578a72e5852a62ae51f59d80f582f (diff) | |
| download | mariadb-git-7cabdf0446534e40e9fac0625dda0d5d4ea21a5b.tar.gz | |
Try to make MySQL compile under Cygwin.
Bug fix for Dec OSF on Alpha.
Minor bug fix for server RPM.
Tweak RPM support for mysqld-max.
configure.in:
Try to identify FIND_PROC for Cygwin. Thanks to Pete French
<pfrench@firstcallgroup.co.uk> for the initial patch.
Add -mieee to C(XX)FLAGS on Dec OSF for alpha, to fix bug w/ floating
point arithmetic. Thanks to nick@netability.ie for the heads up.
Don't make mysql-test depend on --with-bench; always build it. Thanks
to smurf@play.smurf.noris.de for the patch.
include/global.h:
Fix #defines if we are using __CYGWIN__. Thanks to Pete French
<pfrench@firstcallgroup.co.uk> for the initial patch.
support-files/mysql.spec.sh:
Change %preun script so that it doesn't shut down mysqld after an
upgrade. Thanks to Andy Dustman for the patch.
Add a %post Max script to restart mysqld after upgrading to mysqld-max.
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/mysql.spec.sh | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 975c4583a03..f3775779746 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -135,7 +135,7 @@ Obsoletes: mysql-Max %description Max Extra MySQL server binary to get support extra features like -transactional tables. To active these features on only have to install +transactional tables. To active these features one only has to install this package after the server package. %prep @@ -298,15 +298,25 @@ chmod -R og-rw $mysql_datadir/mysql # Allow safe_mysqld to start mysqld and print a message before we exit sleep 2 +%post Max +# Restart mysqld, to use the new binary. +# There may be a better way to handle this. +/etc/rc.d/init.d/mysql stop > /dev/null 2>&1 +echo "Giving mysqld a couple of seconds to restart" +sleep 5 +/etc/rc.d/init.d/mysql start +sleep 2 + %preun -if test -x /etc/rc.d/init.d/mysql -then - /etc/rc.d/init.d/mysql stop > /dev/null -fi -# Remove autostart of mysql if test $1 = 0 then - /sbin/chkconfig --del mysql + if test -x /etc/rc.d/init.d/mysql + then + /etc/rc.d/init.d/mysql stop > /dev/null + fi + + # Remove autostart of mysql + /sbin/chkconfig --del mysql fi # We do not remove the mysql user since it may still own a lot of # database files. |