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

wahwah at users.sourceforge.net wahwah at users.sourceforge.net
Fri Nov 6 11:56:47 CET 2009


Revision: 7141
          http://gar.svn.sourceforge.net/gar/?rev=7141&view=rev
Author:   wahwah
Date:     2009-11-06 10:56:47 +0000 (Fri, 06 Nov 2009)

Log Message:
-----------
mysql5-5.0.x: Adjusting the quick start file, adjusting the startup script, shuffling files around the packages (mysql_config in mysql5devel), adding symlinks from /opt/csw/include/mysql and /opt/csw/lib/mysql

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
    csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/quick_start-csw

Added Paths:
-----------
    csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/ChangeLog
    csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/README.CSW

Removed Paths:
-------------
    csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/README.CSW

Property Changed:
----------------
    csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5
    csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/quick_start-csw

Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile	2009-11-06 10:14:52 UTC (rev 7140)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile	2009-11-06 10:56:47 UTC (rev 7141)
@@ -70,16 +70,39 @@
 CSWmysql5client_programs += perror
 CSWmysql5client_programs += replace
 
+CSWmysql5devel_programs += mysql_config
 
+
 PKGFILES_CSWmysql5bench   = $(prefix)/sql-bench.*
 PKGFILES_CSWmysql5client  = $(bindir)
 PKGFILES_CSWmysql5client += $(foreach bin_name,$(CSWmysql5client_programs),$(call baseisadirs,$(bindir),$(bin_name)))
 PKGFILES_CSWmysql5client += $(foreach bin_name,$(CSWmysql5client_programs),$(mandir)/man1/$(bin_name)\.1)
 PKGFILES_CSWmysql5client += $(foreach bin_name,$(CSWmysql5client_programs),/opt/csw/bin/$(bin_name))
 PKGFILES_CSWmysql5client += $(foreach bin_name,$(CSWmysql5client_programs),/opt/csw/sbin/$(bin_name))
-PKGFILES_CSWmysql5devel  += $(call baseisadirs,$(bindir),mysql_config)
+PKGFILES_CSWmysql5devel  += $(foreach bin_name,$(CSWmysql5devel_programs),$(call baseisadirs,$(bindir),$(bin_name)))
+PKGFILES_CSWmysql5devel  += $(foreach bin_name,$(CSWmysql5devel_programs),$(mandir)/man1/$(bin_name)\.1)
+PKGFILES_CSWmysql5devel  += $(foreach bin_name,$(CSWmysql5devel_programs),/opt/csw/bin/$(bin_name))
+PKGFILES_CSWmysql5devel  += $(foreach bin_name,$(CSWmysql5devel_programs),/opt/csw/sbin/$(bin_name))
 PKGFILES_CSWmysql5devel  += $(mandir)/man1/mysql_config\.1
-PKGFILES_CSWmysql5devel   = $(prefix)/include.*
+PKGFILES_CSWmysql5devel  += $(prefix)/include.*
+PKGFILES_CSWmysql5devel  += /opt/csw/include/mysql
+
+# -/opt/csw/include/mysql --> ../mysql5/include/mysql
+# -/opt/csw/mysql5/bin
+# -/opt/csw/mysql5/bin/mysql_config
+#
+# /opt/csw/bin/mysql_config=../mysql5/bin/mysql_config
+# /opt/csw/mysql5/bin/amd64/mysql_config 0755 root bin
+# /opt/csw/mysql5/bin/i386/mysql_config=/opt/csw/mysql5/bin/mysql_config 0755 root bin
+# /opt/csw/mysql5/bin/mysql_config=/opt/csw/bin/isaexec 0755 root bin
+# /opt/csw/mysql5/share/man/man1/mysql_config.1 0644 root bin
+
+
+# work/build-global/CSWmysql5client.prototype:s none /opt/csw/bin/mysql_config=../mysql5/bin/mysql_config
+# work/build-global/CSWmysql5client.prototype:f none /opt/csw/mysql5/bin/amd64/mysql_config 0755 root bin
+# work/build-global/CSWmysql5client.prototype:f none /opt/csw/mysql5/bin/mysql_config 0755 root bin
+# work/build-global/CSWmysql5client.prototype:f none /opt/csw/mysql5/share/man/man1/mysql_config.1 0644 root bin
+
 PKGFILES_CSWmysql5rt      = $(prefix)/lib/.*\.so.*
 PKGFILES_CSWmysql5test    = $(prefix)/mysql-test.*
 
@@ -91,7 +114,7 @@
 
 MASTER_SITES = ftp://mirror.switch.ch/mirror/mysql/Downloads/MySQL-5.0/
 DISTFILES  = mysql-$(GARVERSION).tar.gz
-DISTFILES += cswmysql5 quick_start-csw README.CSW
+DISTFILES += cswmysql5 quick_start-csw README.CSW ChangeLog
 DISTFILES += CSWmysql5.preinstall
 DISTFILES += CSWmysql5.postinstall
 DISTFILES += cswusergroup
@@ -101,13 +124,8 @@
 REQUIRED_PKGS = CSWncurses CSWzlib
 PREREQUISITE_PKGS = $(REQUIRED_PKGS)
 
-# because we alter the prefix.  this gets us proper linking as well as
-# LD_OPTIONS (RPATH)
-# EXTRA_LIB = /opt/csw/lib
-# EXTRA_INC = /opt/csw/include
 EXTRA_CFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__
 EXTRA_CXXFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__
-# EXTRA_LIB = /opt/csw/mysql5/lib/$$ISALIST/mysql
 
 # Set ./configure options
 CONFIGURE_ARGS  = $(DIRPATHS)
@@ -122,6 +140,7 @@
 CONFIGURE_ARGS += --with-ssl=/opt/csw
 CONFIGURE_ARGS += --with-plugins=max-no-ndb
 
+# TODO: Make the tests pass. They don't at the moment.
 TEST_SCRIPTS =
 
 # Enable 64 bits build
@@ -143,6 +162,7 @@
 post-install-modulated:
 	ginstall -m 755 -d $(DESTDIR)$(localstatedir)
 	ginstall -m 755 -d $(DESTDIR)$(datadir)/mysql/doc
+	ginstall -m 644 $(FILEDIR)/ChangeLog $(DESTDIR)$(datadir)/mysql/doc
 	ginstall -m 644 $(FILEDIR)/README.CSW $(DESTDIR)$(datadir)/mysql/doc
 	ginstall -m 755 -d $(DESTDIR)/opt/csw/share/mysql/doc
 	ln -sf ../../../mysql5/share/mysql/doc/README.CSW \
@@ -153,8 +173,10 @@
 	ginstall -m 755 -d $(DESTDIR)$(global_sysconfdir)/pkg/CSWmysql5
 	ginstall -m 644 $(FILEDIR)/cswusergroup \
 		        $(DESTDIR)$(global_sysconfdir)/pkg/CSWmysql5
-
-	# Create symlinks
+	# A symlink for mysql5 include files
+	ginstall -m 755 -d $(DESTDIR)/opt/csw/include
+	ln -s ../mysql5/include/mysql $(DESTDIR)/opt/csw/include/mysql
+	# Create symlinks to binaries
 	ginstall -m 755 -d $(DESTDIR)$(global_bindir)
 	for f in $(DESTDIR)$(bindir)/*; do \
 		ln -s ../mysql5/bin/`basename $$f` $(DESTDIR)$(global_bindir)/`basename $$f`; \

Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums	2009-11-06 10:14:52 UTC (rev 7140)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums	2009-11-06 10:56:47 UTC (rev 7141)
@@ -1,11 +1,12 @@
-a0b98a7320bce2da3e1f90da704d3c85  download/0001-Use-libc-not-libcrypt.patch
-1414d06fab1530484a508927a0de4154  download/0002-cast-user_info-pw_gid-to-gid_t.patch
-5415f365f1b0f7a179d1efc25f45bbee  download/0003-OpenCSW-perl-for-tests.patch
-8ab232cd4d232b3cda3bbced93f80237  download/0004-basedir-and-datadir-in-the-cnf-files.patch
-9b5511de728fec4394eca7dd0097fb43  download/CSWmysql5.postinstall
-cc2a219abbe7dc6049775cff070a27a5  download/CSWmysql5.preinstall
-70d7860bfa776dfc5510fc11d7c14203  download/README.CSW
-9e86a7c581edf83eac11ceb827c318a2  download/cswmysql5
-67228e1f096fe08a94f4267439a4ec36  download/cswusergroup
-671348f1a5b078da9ca76f97e1fda325  download/mysql-5.0.84.tar.gz
-52ad413f019717b89bd5aa33babdedc3  download/quick_start-csw
+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
+9b5511de728fec4394eca7dd0097fb43  CSWmysql5.postinstall
+cc2a219abbe7dc6049775cff070a27a5  CSWmysql5.preinstall
+e691b0cf00a3925ac55c1844045d6e30  ChangeLog
+e42afb5ec1b1ab02d2ec3b46d0922636  README.CSW
+33387959f9de060dc0af915c9c49bca8  cswmysql5
+67228e1f096fe08a94f4267439a4ec36  cswusergroup
+671348f1a5b078da9ca76f97e1fda325  mysql-5.0.84.tar.gz
+ca622220c7c3ab7427eb1604ddecded6  quick_start-csw

Copied: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/ChangeLog (from rev 7097, csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/README.CSW)
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/ChangeLog	                        (rev 0)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/ChangeLog	2009-11-06 10:56:47 UTC (rev 7141)
@@ -0,0 +1,37 @@
+2009-11-05  Maciej Bliziński  <maciej at opencsw.org>
+
+	* Makefile: Reworked the package from ground up, using GAR.
+
+2007-06-17  Alex Moore
+
+	* Version 5.1: MySQL 5.1 is still in beta.  This package is released
+	for your testing only.
+
+2007-06-03  Alex Moore
+
+	* Startup script: This update fixes a startup script problem that
+	caused the script to not work when --datadir is not the default.  This
+	update also adds amd64 mysqld and client libraries.
+
+2006-12-29  Alex Moore
+
+	* csw.conf: This update adds support for csw.conf.  See the following
+	url for details.  http://www.blastwave.org/standards/csw.conf.html The
+	daemon specific name for this package is mysql5.
+	*** IMPORTANT ***
+	If you are using mysql5rc; please move your options to my.cnf and
+	eliminate mysql5rc.  A future release will remove mysql5rc.  my.cnf is
+	more flexible and any new or missing options will not be added to
+	mysql5rc.  quick_start-csw is changed with this release to Not write
+	mysql5rc.  Options for --basedir and --datadir are included in the
+	default my.cnf files.
+	*** END OF IMPORTANT ***
+
+2006-04-16  Alex Moore
+
+	* quick_start-csw: This update fixes some problems with
+	quick_start-csw and svc-mysql5.  I have also corrected some issues
+	when using a database directory that is not /opt/csw/mysql5/var If you
+	are not using the default location for --datadir, package installation
+	will NOT start CSWmysql5.  More code is needed for that.  I welcome
+	patches.

Deleted: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/README.CSW
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/README.CSW	2009-11-06 10:14:52 UTC (rev 7140)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/README.CSW	2009-11-06 10:56:47 UTC (rev 7141)
@@ -1,62 +0,0 @@
-2007-06-17
-MySQL 5.1 is still in beta.  This package is released for your testing
-only.
-
-2007-06-03
-This update fixes a startup script problem that caused the script to not
-work when --datadir is not the default.
-
-This update also adds amd64 mysqld and client libraries.
-
-2006-12-29
-This update adds support for csw.conf.  See the following url for details.
-http://www.blastwave.org/standards/csw.conf.html
-The daemon specific name for this package is mysql5.
-
-*** IMPORTANT ***
-If you are using mysql5rc; please move your options to my.cnf and eliminate
-  mysql5rc.  A future release will remove mysql5rc.
-my.cnf is more flexible and any new or missing options will not be added to
-  mysql5rc.
-quick_start-csw is changed with this release to Not write mysql5rc.  Options
-  for --basedir and --datadir are included in the default my.cnf files.
-*** END OF IMPORTANT ***
-
-2006-04-16
-This update fixes some problems with quick_start-csw and svc-mysql5.
-I have also corrected some issues when using a database directory that
-  is not /opt/csw/mysql5/var
-
-If you are not using the default location for --datadir, package installation
-  will NOT start CSWmysql5.  More code is needed for that.  I welcome patches.
-
-If you are not using the default location for --datadir, you will find
-  that CSWmysql5 works much better when you create /etc/my.cnf with at
-  least the entries that follow.  You may also want some entries in this
-  global options file for client programs that you use.
-  For example: --datadir is /db/mysql5/var
-  Create /etc/my.cnf with the following entries:
-    # Global MySQL options file.
-    [mysqld]
-    datadir         = /db/mysql5/var
-    basedir         = /opt/csw/mysql5
-
-I also changed the option for --defaults-file to --defaults-extra-file
-  in the startup script.
-  This allows your options file to be read after the global options file
-  /etc/my.cnf.
-
-Note that if you are using the default location for --datadir, you do not
-  really need /etc/opt/csw/mysql5rc.  In this case, you should put any options
-  in the appropriate group in my.cnf.  See the MySQL documentation for 
-  details.
-If you are not using the default location for --datadir, you only need
-  /etc/opt/csw/mysql5rc for the startup script options for
-  --defaults-extra-file and possibly --pid-file.  All other options may be
-  put in the appropriate group in my.cnf
-
-Click 'Views and info' on the package page at
-  http://www.blastwave.org/packages.php/mysql5
-for the latest information.
-
-Alex Moore

Added: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/README.CSW
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/README.CSW	                        (rev 0)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/README.CSW	2009-11-06 10:56:47 UTC (rev 7141)
@@ -0,0 +1,58 @@
+MySQL 5 OpenCSW package
+=======================
+
+* http://www.opencsw.org/packages/mysql5
+
+The package has been reworked from the ground up, using GAR.  Up until this
+moment, the mysql5 package was in the version from before the fork.  The new
+packages are created so that they are as close to the original ones as
+possible, but some changes are inevitable, and some other changes were
+considered necessary.
+
+* Read only /opt/csw support
+  - data in /var/opt/csw
+  - configuration in /etc/opt/csw
+* The prefix is still /opt/csw/mysql5, but all the binaries are now linked from
+  /opt/csw, so that the standard PATH setting allows to use them
+* The startup script is now in /etc/opt/csw/init.d
+* SMF support is handled by cswclassutils
+
+
+Here are the old notes from the previous maintainer, Alex Moore:
+
+--------------8<----------------8<--------------------8<------------------------
+
+If you are not using the default location for --datadir, package installation
+  will NOT start CSWmysql5.  More code is needed for that.  I welcome patches.
+
+If you are not using the default location for --datadir, you will find
+  that CSWmysql5 works much better when you create /etc/my.cnf with at
+  least the entries that follow.  You may also want some entries in this
+  global options file for client programs that you use.
+  For example: --datadir is /db/mysql5/var
+  Create /etc/my.cnf with the following entries:
+    # Global MySQL options file.
+    [mysqld]
+    datadir         = /db/mysql5/var
+    basedir         = /opt/csw/mysql5
+
+I also changed the option for --defaults-file to --defaults-extra-file
+  in the startup script.
+  This allows your options file to be read after the global options file
+  /etc/my.cnf.
+
+Note that if you are using the default location for --datadir, you do not
+  really need /etc/opt/csw/mysql5rc.  In this case, you should put any options
+  in the appropriate group in my.cnf.  See the MySQL documentation for
+  details.
+
+If you are not using the default location for --datadir, you only need
+  /etc/opt/csw/mysql5rc for the startup script options for
+  --defaults-extra-file and possibly --pid-file.  All other options may be
+  put in the appropriate group in my.cnf
+
+Click 'Views and info' on the package page at
+  http://www.opencsw.org/packages.php/mysql5
+for the latest information.
+
+Alex Moore

Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5	2009-11-06 10:14:52 UTC (rev 7140)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5	2009-11-06 10:56:47 UTC (rev 7141)
@@ -1,30 +1,33 @@
 #!/bin/sh
-# Start script for CSW www.blastwave.org package of MySQL database.
 #
-# NOTE: Make sure DB_DIR is owned BY the mysql user and group and chmod 
+# $Id$
+# Start script for MySQL database.
+#
+# NOTE: Make sure DB_DIR is owned BY the mysql user and group and chmod
 # 700.
 #
 # First time installation can use quick_start-csw in
 #   /opt/csw/mysql5/share/mysql to build the mysql database for the
 #   grant tables.  Or create the initial database yourself.
 #
-# Use my.cnf for startup options.  See MySQL documention 
+# Use my.cnf for startup options.  See MySQL documention
 #   for 'Using Option Files'.
 # Support for mysql5rc still remains in this startup script.
 #
 
 RETVAL=0
 MYSQLHOME=/opt/csw/mysql5
-MYSQLD_DATADIR=/var/opt/csw/mysql5
-MYSQLD_PID_FILE=$MYSQLHOME/var/mysql.pid
-CONFFILE=$MYSQLHOME/my.cnf
+MYSQL_VAR=/var/opt/csw/mysql5
+MYSQLD_DATADIR=$MYSQL_VAR
+MYSQLD_PID_FILE=$MYSQL_VAR/mysql.pid
+CONFFILE=$MYSQL_VAR/my.cnf
 
 #
 # Source configuration
 [ -r /opt/csw/mysql5/etc/mysql5rc ] && . /opt/csw/mysql5/etc/mysql5rc
 [ -r /etc/opt/csw/mysql5rc ] && . /etc/opt/csw/mysql5rc
 
-# To get started quickly, copy a sample configuration file from 
+# To get started quickly, copy a sample configuration file from
 #   $MYSQLHOME/share/mysql
 # For example,
 #  cp /opt/csw/mysql5/share/mysql/my-medium.cnf /opt/csw/mysql5/var/my.cnf
@@ -42,95 +45,95 @@
 fi
 
 # If CONFFILE is the server default file, unset CONFFILE
-if [ x"$CONFFILE" = x"$MYSQLHOME/my.cnf" ]; then
+if [ x"$CONFFILE" = x"$MYSQL_VAR/my.cnf" ]; then
     CONFFILE=
 fi
 
 # If MYSQLD_DATADIR does not contain a mysql directory, unset MYSQLD_DATADIR
 # Also, check that MYSQLD_DATADIR contains a mysql directory
-if [ ! -d "$MYSQLHOME/var/mysql" -a ! -d "$MYSQLD_DATADIR/mysql" ] ; then
+if [ ! -d "$MYSQL_VAR/mysql" -a ! -d "$MYSQLD_DATADIR/mysql" ] ; then
     MYSQLD_DATADIR=
 fi
 
 # Make sure required vars are set
-MYSQLD_PID_FILE=${MYSQLD_PID_FILE:=$MYSQLHOME/var/mysql.pid}
+MYSQLD_PID_FILE=${MYSQLD_PID_FILE:=$MYSQL_VAR/mysql.pid}
 
 # If a database already exists, start whether or not there is a conf file.
 # If no conf file, the database will just use internal defaults for everything.
 
 start_it() {
     if test -r $MYSQLD_PID_FILE ; then
-	if kill -0 `cat $MYSQLD_PID_FILE` > /dev/null 2>&1 ; then
-	    echo "mysqld (`cat $MYSQLD_PID_FILE`) seems to be running."
-	    return 1
-	fi
+        if kill -0 `cat $MYSQLD_PID_FILE` > /dev/null 2>&1 ; then
+            echo "mysqld (`cat $MYSQLD_PID_FILE`) seems to be running."
+            return 1
+        fi
     fi
 
     printf "%-60s" "Starting mysqld: "
 # 2006-03-11
-# This script no longer creates the default database. You may create the 
+# 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
 #        echo MySQL core database has not been created.
 #         echo Creating it now...
-#	$MYSQLHOME/bin/mysql_install_db
-#	chown -R mysql:mysql $MYSQLHOME/var
+#       $MYSQLHOME/bin/mysql_install_db
+#       chown -R mysql:mysql $MYSQLHOME/var
 #    fi
 
-# 2006-04-16  --defaults-file is changed to --defaults-extra-file    
+# 2006-04-16  --defaults-file is changed to --defaults-extra-file
     $MYSQLHOME/bin/mysqld_safe \
         `[ -n "$CONFFILE" ] && echo "--defaults-extra-file=$CONFFILE"` \
-	--pid-file=$MYSQLD_PID_FILE \
-	`[ -n "$MYSQLD_PROG" ] && echo "--mysqld=$MYSQLD_PROG"` \
-	`[ -n "$MYSQLD_ANSI" ] && echo "--ansi"` \
-	`[ -n "$MYSQLD_BASEDIR" ] && echo "--basedir=$MYSQLD_BASEDIR"` \
-	`[ -n "$MYSQLD_BIG_TABLES" ] && echo "--big-tables"` \
-	`[ -n "$MYSQLD_BIND_ADDRESS" ] && echo "--bind-address=$MYSQLD_BIND_ADDRESS"` \
-	`[ -n "$MYSQLD_CHARACTER_SETS" ] && echo "--character-sets-dir=$MYSQLD_CHARACTER_SETS"` \
-	`[ -n "$MYSQLD_CHROOT" ] && echo "--chroot=$MYSQLD_CHROOT"` \
-	`[ -n "$MYSQLD_DATADIR" ] && echo "--datadir=$MYSQLD_DATADIR"` \
-	`[ -n "$MYSQLD_DEFAULT_CHARSET" ] && echo "--default-character-set=$MYSQLD_DEFAULT_CHARSET"` \
-	`[ -n "$MYSQLD_DEFAULT_TABLE_TYPE" ] && echo "--default-table-type=$MYSQLD_DEFAULT_TABLE_TYPE"` \
-	`[ -n "$MYSQLD_DELAY_KEY_WRITE_TABLES" ] && echo "--delay-key-write-for-all-tables"` \
-	`[ -n "$MYSQLD_ENABLE_LOCKING" ] && echo "--enable-locking"` \
-	`[ -n "$MYSQLD_EXIT_INFO" ] && echo "--exit-info"` \
-	`[ -n "$MYSQLD_FLUSH" ] && echo "--flush"` \
-	`[ -n "$MYSQLD_INIT_FILE" ] && echo "--init-file=$MYSQLD_INIT_FILE"` \
-	`[ -n "$MYSQLD_LANGUAGE" ] && echo "--language=$MYSQLD_LANGUAGE"` \
-	`[ -n "$MYSQLD_LOG" ] && echo "--log=$MYSQLD_LOG"` \
-	`[ -n "$MYSQLD_LOG_ISAM" ] && echo "--log-isam=$MYSQLD_LOG_ISAM"` \
-	`[ -n "$MYSQLD_LOG_SLOW_QUERIES" ] && echo "--log-slow-queries=$MYSQLD_LOG_SLOW_QUERIES"` \
-	`[ -n "$MYSQLD_LOG_UPDATE" ] && echo "--log-update=$MYSQLD_LOG_UPDATE"` \
-	`[ -n "$MYSQLD_LOG_LONG_FORMAT" ] && echo "--log-long-format"` \
-	`[ -n "$MYSQLD_LOW_PRIORITY_UPDATES" ] && echo "--low-priority-updates"` \
-	`[ -n "$MYSQLD_MEMLOCK" ] && echo "--memlock"` \
-	`[ -n "$MYSQLD_MYISAM_RECOVER" ] && echo "--myisam-recover=$MYSQLD_MYISAM_RECOVER"` \
-	`[ -n "$MYSQLD_PORT" ] && echo "--port=$MYSQLD_PORT"` \
-	`[ -n "$MYSQLD_OLD_PROTOCOL" ] && echo "--old-protocol"` \
-	`[ -n "$MYSQLD_ONE_THREAD" ] && echo "--one-thread"` \
-	`[ -n "$MYSQLD_SET_VARIABLE" ] && echo "--set-variablevar=$MYSQLD_SET_VARIABLE"` \
-	`[ -n "$MYSQLD_SKIP_GRANT_TABLES" ] && echo "--skip-grant-tables"` \
-	`[ -n "$MYSQLD_SAFE_MODE" ] && echo "--safe-mode"` \
-	`[ -n "$MYSQLD_SECURE" ] && echo "--secure"` \
-	`[ -n "$MYSQLD_SKIP_CONCURRENT_INSERT" ] && echo "--skip-concurrent-insert"` \
-	`[ -n "$MYSQLD_SKIP_DELAY_KEY_WRITE" ] && echo "--skip-delay-key-write"` \
-	`[ -n "$MYSQLD_SKIP_LOCKING" ] && echo "--skip-locking"` \
-	`[ -n "$MYSQLD_SKIP_NAME_RESOLVE" ] && echo "--skip-name-resolve"` \
-	`[ -n "$MYSQLD_SKIP_NETWORKING" ] && echo "--skip-networking"` \
-	`[ -n "$MYSQLD_SKIP_NEW" ] && echo "--skip-new"` \
-	`[ -n "$MYSQLD_SKIP_HOST_CACHE" ] && echo "--skip-host-cache"` \
-	`[ -n "$MYSQLD_SKIP_SHOW_DATABASE" ] && echo "--skip-show-database"` \
-	`[ -n "$MYSQLD_SKIP_THREAD_PRIORITY" ] && echo "--skip-thread-priority"` \
-	`[ -n "$MYSQLD_SOCKET" ] && echo "--socket=$MYSQLD_SOCKET"` \
-	`[ -n "$MYSQLD_TMPDIR" ] && echo "--tmpdir=$MYSQLD_TMPDIR"` \
-	`[ -n "$MYSQLD_USER" ] && echo "--user=$MYSQLD_USER"` \
-	& >/dev/null 2>&1
+        --pid-file=$MYSQLD_PID_FILE \
+        `[ -n "$MYSQLD_PROG" ] && echo "--mysqld=$MYSQLD_PROG"` \
+        `[ -n "$MYSQLD_ANSI" ] && echo "--ansi"` \
+        `[ -n "$MYSQLD_BASEDIR" ] && echo "--basedir=$MYSQLD_BASEDIR"` \
+        `[ -n "$MYSQLD_BIG_TABLES" ] && echo "--big-tables"` \
+        `[ -n "$MYSQLD_BIND_ADDRESS" ] && echo "--bind-address=$MYSQLD_BIND_ADDRESS"` \
+        `[ -n "$MYSQLD_CHARACTER_SETS" ] && echo "--character-sets-dir=$MYSQLD_CHARACTER_SETS"` \
+        `[ -n "$MYSQLD_CHROOT" ] && echo "--chroot=$MYSQLD_CHROOT"` \
+        `[ -n "$MYSQLD_DATADIR" ] && echo "--datadir=$MYSQLD_DATADIR"` \
+        `[ -n "$MYSQLD_DEFAULT_CHARSET" ] && echo "--default-character-set=$MYSQLD_DEFAULT_CHARSET"` \
+        `[ -n "$MYSQLD_DEFAULT_TABLE_TYPE" ] && echo "--default-table-type=$MYSQLD_DEFAULT_TABLE_TYPE"` \
+        `[ -n "$MYSQLD_DELAY_KEY_WRITE_TABLES" ] && echo "--delay-key-write-for-all-tables"` \
+        `[ -n "$MYSQLD_ENABLE_LOCKING" ] && echo "--enable-locking"` \
+        `[ -n "$MYSQLD_EXIT_INFO" ] && echo "--exit-info"` \
+        `[ -n "$MYSQLD_FLUSH" ] && echo "--flush"` \
+        `[ -n "$MYSQLD_INIT_FILE" ] && echo "--init-file=$MYSQLD_INIT_FILE"` \
+        `[ -n "$MYSQLD_LANGUAGE" ] && echo "--language=$MYSQLD_LANGUAGE"` \
+        `[ -n "$MYSQLD_LOG" ] && echo "--log=$MYSQLD_LOG"` \
+        `[ -n "$MYSQLD_LOG_ISAM" ] && echo "--log-isam=$MYSQLD_LOG_ISAM"` \
+        `[ -n "$MYSQLD_LOG_SLOW_QUERIES" ] && echo "--log-slow-queries=$MYSQLD_LOG_SLOW_QUERIES"` \
+        `[ -n "$MYSQLD_LOG_UPDATE" ] && echo "--log-update=$MYSQLD_LOG_UPDATE"` \
+        `[ -n "$MYSQLD_LOG_LONG_FORMAT" ] && echo "--log-long-format"` \
+        `[ -n "$MYSQLD_LOW_PRIORITY_UPDATES" ] && echo "--low-priority-updates"` \
+        `[ -n "$MYSQLD_MEMLOCK" ] && echo "--memlock"` \
+        `[ -n "$MYSQLD_MYISAM_RECOVER" ] && echo "--myisam-recover=$MYSQLD_MYISAM_RECOVER"` \
+        `[ -n "$MYSQLD_PORT" ] && echo "--port=$MYSQLD_PORT"` \
+        `[ -n "$MYSQLD_OLD_PROTOCOL" ] && echo "--old-protocol"` \
+        `[ -n "$MYSQLD_ONE_THREAD" ] && echo "--one-thread"` \
+        `[ -n "$MYSQLD_SET_VARIABLE" ] && echo "--set-variablevar=$MYSQLD_SET_VARIABLE"` \
+        `[ -n "$MYSQLD_SKIP_GRANT_TABLES" ] && echo "--skip-grant-tables"` \
+        `[ -n "$MYSQLD_SAFE_MODE" ] && echo "--safe-mode"` \
+        `[ -n "$MYSQLD_SECURE" ] && echo "--secure"` \
+        `[ -n "$MYSQLD_SKIP_CONCURRENT_INSERT" ] && echo "--skip-concurrent-insert"` \
+        `[ -n "$MYSQLD_SKIP_DELAY_KEY_WRITE" ] && echo "--skip-delay-key-write"` \
+        `[ -n "$MYSQLD_SKIP_LOCKING" ] && echo "--skip-locking"` \
+        `[ -n "$MYSQLD_SKIP_NAME_RESOLVE" ] && echo "--skip-name-resolve"` \
+        `[ -n "$MYSQLD_SKIP_NETWORKING" ] && echo "--skip-networking"` \
+        `[ -n "$MYSQLD_SKIP_NEW" ] && echo "--skip-new"` \
+        `[ -n "$MYSQLD_SKIP_HOST_CACHE" ] && echo "--skip-host-cache"` \
+        `[ -n "$MYSQLD_SKIP_SHOW_DATABASE" ] && echo "--skip-show-database"` \
+        `[ -n "$MYSQLD_SKIP_THREAD_PRIORITY" ] && echo "--skip-thread-priority"` \
+        `[ -n "$MYSQLD_SOCKET" ] && echo "--socket=$MYSQLD_SOCKET"` \
+        `[ -n "$MYSQLD_TMPDIR" ] && echo "--tmpdir=$MYSQLD_TMPDIR"` \
+        `[ -n "$MYSQLD_USER" ] && echo "--user=$MYSQLD_USER"` \
+        & >/dev/null 2>&1
     RETVAL=$?
     if [ $RETVAL = 0 ] ; then
-	echo "[  OK  ]"
+        echo "[  OK  ]"
     else
-	echo "[FAILED]"
-	return 1
+        echo "[FAILED]"
+        return 1
     fi
     return 0
 }
@@ -139,16 +142,16 @@
 
     printf "%-60s" "Shutting down mysqld: "
     if test -f "$MYSQLD_PID_FILE" ; then
-	pkill mysqld_safe >/dev/null 2>&1
-	kill `cat $MYSQLD_PID_FILE` >/dev/null 2>&1
-	RETVAL=$?
+        pkill mysqld_safe >/dev/null 2>&1
+        kill `cat $MYSQLD_PID_FILE` >/dev/null 2>&1
+        RETVAL=$?
     else
-	RETVAL=1
+        RETVAL=1
     fi
     if [ $RETVAL = 0 ] ; then
-	echo "[  OK  ]"
+        echo "[  OK  ]"
     else
-	echo "[FAILED]"
+        echo "[FAILED]"
     fi
     echo ""
     return 0


Property changes on: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5
___________________________________________________________________
Added: svn:keywords
   + Id

Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/quick_start-csw
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/quick_start-csw	2009-11-06 10:14:52 UTC (rev 7140)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/quick_start-csw	2009-11-06 10:56:47 UTC (rev 7141)
@@ -1,21 +1,24 @@
 #!/bin/ksh -p
+#
+# $Id$
+#
 # initial version for blastwave.org by Alex Moore 2006.02.25
 # Revised 2006.03.25 - see bug report 0001542
 #
 # 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=$BASEDIR/my.cnf
+SAVE_DEFAULTS_FILE=$MYSQL_VAR/my.cnf
 MYSQLD_USER=mysql
 #
 # Provide a default data directory
-MYSQLD_DATADIR=/var/opt/csw/mysql5
+MYSQLD_DATADIR=$MYSQL_VAR
 #
 echo
-echo  "This is the blastwave quick start script to setup a MySQL5 database"
+echo  "This is the start script to setup a MySQL-5 database"
 echo  "  directory."
 echo
 echo  "  The base directory is $BASEDIR."
@@ -48,11 +51,11 @@
     ` || exit $?
 if [ $usrin = "[default]" ]; then
     if [ ! -f "$DEFAULTS_FILE" ]; then
-	IN_DEFAULTS_FILE=$BASEDIR/share/mysql/my-small.cnf
-	echo "Using $IN_DEFAULTS_FILE to create the options file."
+        IN_DEFAULTS_FILE=$BASEDIR/share/mysql/my-small.cnf
+        echo "Using $IN_DEFAULTS_FILE to create the options file."
     else
-	IN_DEFAULTS_FILE=$DEFAULTS_FILE
-	echo "Using $DEFAULTS_FILE as the options file."
+        IN_DEFAULTS_FILE=$DEFAULTS_FILE
+        echo "Using $DEFAULTS_FILE as the options file."
     fi
 else
     IN_DEFAULTS_FILE=$usrin


Property changes on: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/quick_start-csw
___________________________________________________________________
Added: svn:keywords
   + Id


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