[csw-devel] SF.net SVN: gar:[15847] csw/mgar/pkg/mysql5/branches/mysql-5.0.x

[wahwah at users.sourceforge.net]

Revision: 15847
          http://gar.svn.sourceforge.net/gar/?rev=15847&view=rev
Author:   wahwah
Date:     2011-10-04 09:33:54 +0000 (Tue, 04 Oct 2011)
Log Message:
-----------
pkg/mysql5/branches/mysql-5.0.x: use versions better

Modified Paths:
--------------
    csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile
    csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5.tpl

Added Paths:
-----------
    csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/0006-Use-my_print_defaults-5.0.patch

Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile	2011-10-04 08:48:34 UTC (rev 15846)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile	2011-10-04 09:33:54 UTC (rev 15847)
@@ -133,6 +133,8 @@
 # PATCHFILES += 0003-OpenCSW-perl-for-tests.patch
 PATCHFILES += 0004-basedir-and-datadir-in-the-cnf-files.patch
 PATCHFILES += 0004-looking-for-ps-use-basename-0.patch
+# Perhaps using sed would be better, but we have a patch for now.
+PATCHFILES += 0006-Use-my_print_defaults-$(BASE_VERSION).patch
 
 # Enable 64 bits build
 BUILD64 = 1

Added: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/0006-Use-my_print_defaults-5.0.patch
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/0006-Use-my_print_defaults-5.0.patch	                        (rev 0)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/0006-Use-my_print_defaults-5.0.patch	2011-10-04 09:33:54 UTC (rev 15847)
@@ -0,0 +1,46 @@
+From 6e4feb9221edd2d3992c68c56bfecaf3a0551563 Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Tue, 4 Oct 2011 11:30:30 +0200
+Subject: [PATCH] Use my_print_defaults-5.0
+
+---
+ scripts/mysqld_safe.sh |   18 +++++++++---------
+ 1 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh
+index 71b833c..bb79476 100644
+--- a/scripts/mysqld_safe.sh
++++ b/scripts/mysqld_safe.sh
+@@ -192,20 +192,20 @@ err_log=
+ 
+ # Get first arguments from the my.cnf file, groups [mysqld] and [mysqld_safe]
+ # and then merge with the command line arguments
+-if test -x "$MY_BASEDIR_VERSION/bin/my_print_defaults"
++if test -x "$MY_BASEDIR_VERSION/bin/my_print_defaults-5.0"
+ then
+-  print_defaults="$MY_BASEDIR_VERSION/bin/my_print_defaults"
+-elif test -x ./bin/my_print_defaults
++  print_defaults="$MY_BASEDIR_VERSION/bin/my_print_defaults-5.0"
++elif test -x ./bin/my_print_defaults-5.0
+ then
+-  print_defaults="./bin/my_print_defaults"
+-elif test -x @bindir@/my_print_defaults
++  print_defaults="./bin/my_print_defaults-5.0"
++elif test -x @bindir@/my_print_defaults-5.0
+ then
+-  print_defaults="@bindir@/my_print_defaults"
+-elif test -x @bindir@/mysql_print_defaults
++  print_defaults="@bindir@/my_print_defaults-5.0"
++elif test -x @bindir@/mysql_print_defaults-5.0
+ then
+-  print_defaults="@bindir@/mysql_print_defaults"
++  print_defaults="@bindir@/mysql_print_defaults"-5.0
+ else
+-  print_defaults="my_print_defaults"
++  print_defaults="my_print_defaults-5.0"
+ fi
+ 
+ args=
+-- 
+1.7.6.1
+

Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5.tpl
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5.tpl	2011-10-04 08:48:34 UTC (rev 15846)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5.tpl	2011-10-04 09:33:54 UTC (rev 15847)
@@ -22,6 +22,7 @@
 BINDIR="@bindir@"
 MYSQL_VAR="@localstatedir@"
 sysconfdir="@sysconfdir@"
+BASE_VERSION="@BASE_VERSION@"
 MYSQLD_DATADIR=$MYSQL_VAR
 MYSQLD_PID_FILE=$MYSQL_VAR/mysql.pid
 CONFFILE=${sysconfdir}/my.cnf
@@ -96,7 +97,8 @@
     #    fi
 
     # 2006-04-16  --defaults-file is changed to --defaults-extra-file
-    ${BINDIR}/mysqld_safe \
+    ${BINDIR}/mysqld_safe-${BASE_VERSION} \
+        --mysqld-version=${BASE_VERSION} \
         `[ -n "$CONFFILE" ] && echo "--defaults-extra-file=$CONFFILE"` \
         --pid-file=$MYSQLD_PID_FILE \
         `[ -n "$MYSQLD_PROG" ] && echo "--mysqld=$MYSQLD_PROG"` \

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.