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

wahwah at users.sourceforge.net wahwah at users.sourceforge.net
Sat Jan 1 19:18:23 CET 2011


Revision: 12142
          http://gar.svn.sourceforge.net/gar/?rev=12142&view=rev
Author:   wahwah
Date:     2011-01-01 18:18:23 +0000 (Sat, 01 Jan 2011)

Log Message:
-----------
mysql-5.0.x: Moving my.cnf to /etc/opt/csw

Keeping the patchlevel at 87, since 90 does not build and 91 is not out yet.

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

Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile	2010-12-30 22:21:59 UTC (rev 12141)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile	2011-01-01 18:18:23 UTC (rev 12142)
@@ -2,10 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+# 5.0.90 doesn't build:
+# http://bugs.mysql.com/bug.php?id=50409
+# Let's wait for 5.0.91.
+
 PROJ_NAME = mysql
 NAME = $(PROJ_NAME)5
 BASE_VERSION = 5.0
-PATCHLEVEL = 90
+PATCHLEVEL = 87
 VERSION = $(BASE_VERSION).$(PATCHLEVEL)
 CATEGORIES = server
 
@@ -148,16 +152,21 @@
 # Set ./configure options
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --disable-assembler
+# Why not have a docs package?
+# CONFIGURE_ARGS += --without-docs
 CONFIGURE_ARGS += --enable-local-infile
-CONFIGURE_ARGS += --enable-thread-safe-client
+CONFIGURE_ARGS += --with-charset=utf8
 CONFIGURE_ARGS += --with-extra-charsets=all
 CONFIGURE_ARGS += --with-low-memory
-CONFIGURE_ARGS += --with-plugins=max-no-ndb
 CONFIGURE_ARGS += --with-pthread
 CONFIGURE_ARGS += --with-readline
+CONFIGURE_ARGS += --with-zlib-dir=/opt/csw
 CONFIGURE_ARGS += --with-ssl=/opt/csw
-CONFIGURE_ARGS += --with-zlib-dir=/opt/csw
-CONFIGURE_ARGS += --without-docs
+CONFIGURE_ARGS += --with-plugins=max-no-ndb
+CONFIGURE_ARGS += --with-comment
+CONFIGURE_ARGS += --with-mysqld-libs=-lmtmalloc
+CONFIGURE_ARGS += --with-big-tables
+CONFIGURE_ARGS += --enable-thread-safe-client
 CONFIGURE_ARGS_DBG = --with-debug
 CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR))
 
@@ -174,13 +183,21 @@
 PROTOTYPE_PERMS_dbdir = 0700
 PROTOTYPE_CLASS_dbdir = ugfiles
 
-# Until the dependency guessed gets better at guessing
-CHECKPKG_OVERRIDES_CSWmysql5devel += missing-dependency|CSWmysql5
+CHECKPKG_OVERRIDES_CSWmysql5test += surplus-dependency|CSWmysql5
+CHECKPKG_OVERRIDES_CSWmysql5devel += surplus-dependency|CSWmysql5rt
+CHECKPKG_OVERRIDES_CSWmysql5 += surplus-dependency|CSWmysql5client
+CHECKPKG_OVERRIDES_CSWmysql5bench += surplus-dependency|CSWmysql5
 
 include gar/category.mk
 
 CFLAGS := $(filter-out -I%,$(CFLAGS))
 
+test-custom:
+	alias sh=/usr/bin/bash;                           \
+		cd $(WORKSRC)/mysql-test;                       \
+		perl mysql-test-run.pl --mem --big-test --force \
+		--skip-test=archive-big --skip-test=/gis/
+
 pre-configure-modulated:
 	# To work around the following libtool version mismatch problem:
 	# libtool: Version mismatch error.  This is libtool 2.2.6, but the

Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums	2010-12-30 22:21:59 UTC (rev 12141)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums	2011-01-01 18:18:23 UTC (rev 12142)
@@ -1,12 +1 @@
-a0b98a7320bce2da3e1f90da704d3c85  0001-Use-libc-not-libcrypt.patch
-1414d06fab1530484a508927a0de4154  0002-cast-user_info-pw_gid-to-gid_t.patch
-5415f365f1b0f7a179d1efc25f45bbee  0003-OpenCSW-perl-for-tests.patch
-8ab232cd4d232b3cda3bbced93f80237  0004-basedir-and-datadir-in-the-cnf-files.patch
-bd7647733a5cc2e6e3dd7e7d4b8d311f  CSWmysql5.postinstall
-60162ea667507a6a487027e7c389ca55  CSWmysql5.preinstall
-e691b0cf00a3925ac55c1844045d6e30  ChangeLog
-e42afb5ec1b1ab02d2ec3b46d0922636  README.CSW
-aaca748fc044834e71ad544ab293c494  cswmysql5
-67228e1f096fe08a94f4267439a4ec36  cswusergroup
-6d325f2b4a60539699558bc5e4452388  mysql-5.0.90.tar.gz
-0d083f6dab0bc083fd302ef1375e3d59  quick_start-csw
+65e6229cc98b6a8d4c5206d7fe16c7be  mysql-5.0.87.tar.gz

Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.postinstall
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.postinstall	2010-12-30 22:21:59 UTC (rev 12141)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.postinstall	2011-01-01 18:18:23 UTC (rev 12142)
@@ -8,20 +8,22 @@
 # This script creates a default database with the small-memory footprint.
 # Input may be provided for DATADIR and DEFAULTS_FILE
 #
-BASEDIR=/opt/csw/mysql5
-MYSQL_VAR=/var/opt/csw/mysql5
-DEFAULTS_FILE=$BASEDIR/my.cnf
-SAVE_DEFAULTS_FILE=$MYSQL_VAR/my.cnf
-MYSQLD_USER=mysql
+MYSQL_HOME="/opt/csw/mysql5"
+MYSQL_VAR="/var/opt/csw/mysql5"
+sysconfdir="/etc/opt/csw/mysql5"
+# https://www.opencsw.org/mantis/view.php?id=4646
+WRONG_LOCATION_DEFAULTS_FILES="${MYSQL_VAR}/my.cnf"
+DEFAULTS_FILE="${sysconfdir}/my.cnf"
+MYSQLD_USER="mysql"
 # Provide the default data directory
-MYSQLD_DATADIR=$MYSQL_VAR
+MYSQLD_DATADIR="${MYSQL_VAR}"
 
 # http://bugs.mysql.com/bug.php?id=31164
 # ERROR: 1004  Can't create file '/var/tmp//installRJaiQ3/#sql6fee_1_0.frm' (errno: 13)
 unset TMPDIR
 
 if [ ! -f "$DEFAULTS_FILE" ]; then
-    IN_DEFAULTS_FILE=$BASEDIR/share/mysql/my-small.cnf
+    IN_DEFAULTS_FILE=$MYSQL_HOME/share/mysql/my-small.cnf
     echo "Using $IN_DEFAULTS_FILE to create the options file."
 else
     IN_DEFAULTS_FILE=$DEFAULTS_FILE
@@ -53,10 +55,10 @@
 echo "Creating MySQL core database in $MYSQLD_DATADIR"
 echo
 echo "###  The following messages are from mysql_install_db."
-$BASEDIR/bin/mysql_install_db \
+$MYSQL_HOME/bin/mysql_install_db \
     --defaults-extra-file="$DEFAULTS_FILE" \
     --user="$MYSQLD_USER" \
-    --basedir="$BASEDIR" \
+    --basedir="$MYSQL_HOME" \
     --datadir="$MYSQLD_DATADIR"
 
 # Fix permissions on the data directory, since mysql_install_db was run as

Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5	2010-12-30 22:21:59 UTC (rev 12141)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5	2011-01-01 18:18:23 UTC (rev 12142)
@@ -16,11 +16,12 @@
 #
 
 RETVAL=0
-MYSQLHOME=/opt/csw/mysql5
-MYSQL_VAR=/var/opt/csw/mysql5
+MYSQL_HOME="/opt/csw/mysql5"
+MYSQL_VAR="/var/opt/csw/mysql5"
+sysconfdir="/etc/opt/csw/mysql5"
 MYSQLD_DATADIR=$MYSQL_VAR
 MYSQLD_PID_FILE=$MYSQL_VAR/mysql.pid
-CONFFILE=$MYSQL_VAR/my.cnf
+CONFFILE=${sysconfdir}/my.cnf
 
 #
 # Source configuration
@@ -28,7 +29,7 @@
 [ -r /etc/opt/csw/mysql5rc ] && . /etc/opt/csw/mysql5rc
 
 # To get started quickly, copy a sample configuration file from
-#   $MYSQLHOME/share/mysql
+#   $MYSQL_HOME/share/mysql
 # For example,
 #  cp /opt/csw/mysql5/share/mysql/my-medium.cnf /opt/csw/mysql5/var/my.cnf
 #
@@ -73,15 +74,15 @@
 # 2006-03-11
 # This script no longer creates the default database. You may create the
 # default database manually or use /opt/csw/mysql5/share/mysql/quick_start-csw
-#    if [ ! -d "$MYSQLHOME/var/mysql" ] ; then
+#    if [ ! -d "$MYSQL_HOME/var/mysql" ] ; then
 #        echo MySQL core database has not been created.
 #         echo Creating it now...
-#       $MYSQLHOME/bin/mysql_install_db
-#       chown -R mysql:mysql $MYSQLHOME/var
+#       $MYSQL_HOME/bin/mysql_install_db
+#       chown -R mysql:mysql $MYSQL_HOME/var
 #    fi
 
 # 2006-04-16  --defaults-file is changed to --defaults-extra-file
-    $MYSQLHOME/bin/mysqld_safe \
+    $MYSQL_HOME/bin/mysqld_safe \
         `[ -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.


More information about the devel mailing list