OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 30-Oct-2006 15:23:42
Branch: OPENPKG_2_STABLE Handle: 2006103014234100
Modified files: (Branch: OPENPKG_2_STABLE)
openpkg-src/mysql mysql.spec rc.mysql
Log:
upgrade to ABI fixed version and merge in latest logfile rotation
fixes
Summary:
Revision Changes Path
1.146.2.5 +2 -2 openpkg-src/mysql/mysql.spec
1.27.2.4 +7 -4 openpkg-src/mysql/rc.mysql
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/mysql/mysql.spec
============================================================================
$ cvs diff -u -r1.146.2.4 -r1.146.2.5 mysql.spec
--- openpkg-src/mysql/mysql.spec 16 Oct 2006 14:53:04 -0000
1.146.2.4
+++ openpkg-src/mysql/mysql.spec 30 Oct 2006 14:23:41 -0000
1.146.2.5
@@ -24,7 +24,7 @@
# package version
%define V_major 5.0
-%define V_minor 26
+%define V_minor 27
%define V_mysql %{V_major}.%{V_minor}
%define V_opkg %{V_major}.%{V_minor}
@@ -39,7 +39,7 @@
Group: Database
License: GPL
Version: %{V_opkg}
-Release: 2.20061018
+Release: 2.20061030
# package options
%option with_server yes
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mysql/rc.mysql
============================================================================
$ cvs diff -u -r1.27.2.3 -r1.27.2.4 rc.mysql
--- openpkg-src/mysql/rc.mysql 16 Oct 2006 14:53:04 -0000 1.27.2.3
+++ openpkg-src/mysql/rc.mysql 30 Oct 2006 14:23:41 -0000 1.27.2.4
@@ -28,6 +28,11 @@
[EMAIL PROTECTED]@/var/mysql/mysqld.err
[EMAIL PROTECTED]@/var/mysql/common.log
[EMAIL PROTECTED]@/var/mysql/update.log
+ mysql_flush_logs () {
+ [EMAIL PROTECTED]@/etc/mysql @l_prefix@/bin/mysqladmin \
+ --defaults-extra-file=${mysql_pwd_file} \
+ flush-logs
+ }
%status -u @l_susr@ -o
mysql_usable="unknown"
@@ -54,9 +59,7 @@
%stop -p 600 -u @l_susr@
rcService mysql enable yes || exit 0
rcService mysql active no && exit 0
- [EMAIL PROTECTED]@/etc/mysql @l_prefix@/bin/mysqladmin \
- --defaults-extra-file=${mysql_pwd_file} \
- flush-logs
+ mysql_flush_logs
[EMAIL PROTECTED]@/etc/mysql @l_prefix@/bin/mysqladmin \
--defaults-extra-file=${mysql_pwd_file} \
shutdown
@@ -89,7 +92,7 @@
-E "${mysql_err_epilog}; echo 1 >$hintfile" \
${mysql_err_log}
if [ -s $hintfile ]; then
- rc mysql restart
+ mysql_flush_logs
fi
rcTmp -k
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
