[csw-devel] SF.net SVN: gar:[10724] csw/mgar/pkg/mysql5/branches/mysql-5.1.x
wahwah at users.sourceforge.net
wahwah at users.sourceforge.net
Thu Aug 12 10:15:41 CEST 2010
Revision: 10724
http://gar.svn.sourceforge.net/gar/?rev=10724&view=rev
Author: wahwah
Date: 2010-08-12 08:15:40 +0000 (Thu, 12 Aug 2010)
Log Message:
-----------
mysql-5.1: Updates from Derek Harland
Modified Paths:
--------------
csw/mgar/pkg/mysql5/branches/mysql-5.1.x/checksums
csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/0004-basedir-and-datadir-in-the-cnf-files.patch
csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/CSWmysql51.preinstall
csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/README.CSW
csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/cswmysql51
csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/cswusergroup
csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/quick_start-csw
Modified: csw/mgar/pkg/mysql5/branches/mysql-5.1.x/checksums
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.1.x/checksums 2010-08-12 07:56:45 UTC (rev 10723)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x/checksums 2010-08-12 08:15:40 UTC (rev 10724)
@@ -1,12 +1,12 @@
8940e0673e599689932e94fec906aec9 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
-07d91851bd734c60ad98dc2b39fafe0b CSWmysql51.postinstall
-615c16877afb48ce809a849c1c5dbc35 CSWmysql51.preinstall
+8303cd39dd86f9f01f1f0f01b15fe37d 0004-basedir-and-datadir-in-the-cnf-files.patch
+a1008df3aee0528449eb18f39bc21603 CSWmysql51.postinstall
+94f878853bc991655c1d4cd9c3c129af CSWmysql51.preinstall
e691b0cf00a3925ac55c1844045d6e30 ChangeLog
-e42afb5ec1b1ab02d2ec3b46d0922636 README.CSW
-ac9af0e13c6e075ac87f19fdf171776d cswmysql51
-67228e1f096fe08a94f4267439a4ec36 cswusergroup
+59f9d5aa04d8e8d3806bec666d01e096 README.CSW
+47af0fcc5dbb231501ba5722b3357bec cswmysql51
+e3000190fef8aa4cfbd527bb5e40d9a6 cswusergroup
a90d87a71fa3c23dff6d78afc8e3184c mysql-5.1.49.tar.gz
-90b7cfcd11ab56e021a195a6a085fa21 quick_start-csw
+8700dc15628995b6f037af0fe9b55b54 quick_start-csw
Modified: csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/0004-basedir-and-datadir-in-the-cnf-files.patch
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/0004-basedir-and-datadir-in-the-cnf-files.patch 2010-08-12 07:56:45 UTC (rev 10723)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/0004-basedir-and-datadir-in-the-cnf-files.patch 2010-08-12 08:15:40 UTC (rev 10724)
@@ -19,8 +19,8 @@
# The MySQL server
[mysqld]
-+basedir = /opt/csw/mysql5
-+datadir = /var/opt/csw/mysql5
++basedir = /opt/csw/mysql51
++datadir = /var/opt/csw/mysql51
port = @MYSQL_TCP_PORT@
socket = @MYSQL_UNIX_ADDR@
skip-locking
@@ -32,8 +32,8 @@
# The MySQL server
#
[mysqld]
-+basedir = /opt/csw/mysql5
-+datadir = /var/opt/csw/mysql5
++basedir = /opt/csw/mysql51
++datadir = /var/opt/csw/mysql51
# generic configuration options
port = @MYSQL_TCP_PORT@
@@ -45,8 +45,8 @@
# The MySQL server
[mysqld]
-+basedir = /opt/csw/mysql5
-+datadir = /var/opt/csw/mysql5
++basedir = /opt/csw/mysql51
++datadir = /var/opt/csw/mysql51
port = @MYSQL_TCP_PORT@
socket = @MYSQL_UNIX_ADDR@
skip-locking
@@ -58,8 +58,8 @@
# The MySQL server
[mysqld]
-+basedir = /opt/csw/mysql5
-+datadir = /var/opt/csw/mysql5
++basedir = /opt/csw/mysql51
++datadir = /var/opt/csw/mysql51
port = @MYSQL_TCP_PORT@
socket = @MYSQL_UNIX_ADDR@
skip-locking
@@ -67,12 +67,12 @@
index 24c0840..89299dd 100644
--- a/support-files/my-small.cnf.sh
+++ b/support-files/my-small.cnf.sh
-@@ -24,6 +24,8 @@ socket = @MYSQL_UNIX_ADDR@
+@@ -24,7 +24,8 @@ socket = @MYSQL_UNIX_ADDR@
# The MySQL server
[mysqld]
-+basedir = /opt/csw/mysql5
-+datadir = /var/opt/csw/mysql5
++basedir = /opt/csw/mysql51
++datadir = /var/opt/csw/mysql51
port = @MYSQL_TCP_PORT@
socket = @MYSQL_UNIX_ADDR@
skip-locking
Modified: csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/CSWmysql51.preinstall
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/CSWmysql51.preinstall 2010-08-12 07:56:45 UTC (rev 10723)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/CSWmysql51.preinstall 2010-08-12 08:15:40 UTC (rev 10724)
@@ -4,7 +4,7 @@
# $Id$
#
-obsolete_directories="/opt/csw/mysql5/var:/var/opt/csw/mysql5"
+obsolete_directories="/opt/csw/mysql51/var:/var/opt/csw/mysql51"
obsolete_dir_information="
This directory is obsolete. Files in this directory are going to be ignored.
Modified: csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/README.CSW
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/README.CSW 2010-08-12 07:56:45 UTC (rev 10723)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/README.CSW 2010-08-12 08:15:40 UTC (rev 10724)
@@ -1,7 +1,7 @@
-MySQL 5 OpenCSW package
+MySQL 5.1 OpenCSW package
=======================
-* http://www.opencsw.org/packages/mysql5
+* http://www.opencsw.org/packages/mysql51
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
@@ -12,7 +12,7 @@
* 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
+* The prefix is still /opt/csw/mysql51, 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
Modified: csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/cswmysql51
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/cswmysql51 2010-08-12 07:56:45 UTC (rev 10723)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/cswmysql51 2010-08-12 08:15:40 UTC (rev 10724)
@@ -7,30 +7,30 @@
# 700.
#
# First time installation can use quick_start-csw in
-# /opt/csw/mysql5/share/mysql to build the mysql database for the
+# /opt/csw/mysql51/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
# for 'Using Option Files'.
-# Support for mysql5rc still remains in this startup script.
+# Support for mysql51rc still remains in this startup script.
#
RETVAL=0
-MYSQLHOME=/opt/csw/mysql5
-MYSQL_VAR=/var/opt/csw/mysql5
+MYSQLHOME=/opt/csw/mysql51
+MYSQL_VAR=/var/opt/csw/mysql51
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
+[ -r /opt/csw/mysql51/etc/mysql51rc ] && . /opt/csw/mysql51/etc/mysql51rc
+[ -r /etc/opt/csw/mysql51rc ] && . /etc/opt/csw/mysql51rc
# 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
+# cp /opt/csw/mysql51/share/mysql/my-medium.cnf /opt/csw/mysql51/var/my.cnf
#
# Or, manually follow the database creation steps below, and have
# mysql just use defaults for everything.
@@ -72,7 +72,7 @@
printf "%-60s" "Starting mysqld: "
# 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
+# default database manually or use /opt/csw/mysql51/share/mysql/quick_start-csw
# if [ ! -d "$MYSQLHOME/var/mysql" ] ; then
# echo MySQL core database has not been created.
# echo Creating it now...
Modified: csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/cswusergroup
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/cswusergroup 2010-08-12 07:56:45 UTC (rev 10723)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/cswusergroup 2010-08-12 08:15:40 UTC (rev 10724)
@@ -1 +1 @@
-mysql:mysql:MySQL database user:/var/opt/csw/mysql5:/bin/false::
+mysql:mysql:MySQL database user:/var/opt/csw/mysql51:/bin/false::
Modified: csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/quick_start-csw
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/quick_start-csw 2010-08-12 07:56:45 UTC (rev 10723)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/quick_start-csw 2010-08-12 08:15:40 UTC (rev 10724)
@@ -8,8 +8,8 @@
# 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
+BASEDIR=/opt/csw/mysql51
+MYSQL_VAR=/var/opt/csw/mysql51
DEFAULTS_FILE=$BASEDIR/my.cnf
SAVE_DEFAULTS_FILE=$MYSQL_VAR/my.cnf
MYSQLD_USER=mysql
@@ -115,7 +115,7 @@
#
# Update --datadir in the cnf file with the correct value if file was copied
if [ x"$CNFCOPIED" = xyes ]; then
- sed -e "s|/var/opt/csw/mysql5|$MYSQLD_DATADIR|g" $DEFAULTS_FILE >$DEFAULTS_FILE.new
+ sed -e "s|/var/opt/csw/mysql51|$MYSQLD_DATADIR|g" $DEFAULTS_FILE >$DEFAULTS_FILE.new
mv $DEFAULTS_FILE.new $DEFAULTS_FILE
fi
@@ -123,17 +123,17 @@
# Ending message
echo
echo "### The following messages are from quick_start-csw."
-echo "See /opt/csw/mysql5/share/mysql/doc/README.CSW for packaging changes."
+echo "See /opt/csw/mysql51/share/mysql/doc/README.CSW for packaging changes."
echo "Please ignore references to starting mysqld_safe in the messages above."
echo " These messages are from mysql_install_db. See the following"
-echo " for starting CSWmysql5."
+echo " for starting CSWmysql51."
smf=no
if [ -f /usr/sbin/svccfg -a -f /usr/sbin/svcadm ] ; then smf=yes ; fi
if [ $smf = yes ]
then
- echo "To start mysqld; run \`svcadm enable cswmysql5\` on Solaris 10 or later"
+ echo "To start mysqld; run \`svcadm enable cswmysql51\` on Solaris 10 or later"
else
- echo "To start mysqld; run \`/etc/opt/csw/init.d/cswmysql start\` on Solaris 9 or earlier"
+ echo "To start mysqld; run \`/etc/opt/csw/init.d/cswmysql51 start\` on Solaris 9 or earlier"
fi
exit 0
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