SF.net SVN: gar:[22197] csw/mgar/pkg/mysql5/branches

lblume at users.sourceforge.net lblume at users.sourceforge.net
Fri Oct 11 12:08:31 CEST 2013


Revision: 22197
          http://gar.svn.sourceforge.net/gar/?rev=22197&view=rev
Author:   lblume
Date:     2013-10-11 10:08:30 +0000 (Fri, 11 Oct 2013)
Log Message:
-----------
mysql5/branches/mysql-5.5.x: clean up of old unused bits in the recipe; update & clarify the readme; remove the old changelog

Modified Paths:
--------------
    csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile
    csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/CSWmysql5.postinstall
    csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/README.CSW
    csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile
    csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/CSWmysql5.postinstall
    csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/README.CSW

Removed Paths:
-------------
    csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0001-Use-libc-not-libcrypt.patch
    csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0002-cast-user_info-pw_gid-to-gid_t.patch
    csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0002-stop-cmake-from-messing-with-cflags.patch
    csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0003-OpenCSW-perl-for-tests.patch
    csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0004-looking-for-ps-use-basename-0.patch
    csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0004-var-opt-csw-mysql51-for-datadir-in-my-.cnf.patch
    csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0005_my_vsnprintf-t_fails_bug_62572.patch
    csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/64/
    csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/ChangeLog

Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile	2013-10-11 09:33:31 UTC (rev 22196)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile	2013-10-11 10:08:30 UTC (rev 22197)
@@ -65,14 +65,8 @@
 OPT_FLAGS_SOS-64 = -xO3
 OPT_FLAGS_SOS = $(OPT_FLAGS_SOS-$(MEMORYMODEL))
 
-
 INITSMF = $(sysconfdir)/init\.d/csw$(NAME)
 
-# Existing databases are in this location
-localstatedir = /var$(BUILD_PREFIX)/$(NAME)
-# To avoid file conflicts
-# datadir = $(prefix)/share/mysql/$(BASE_VERSION)
-
 MYSQL_LIB_VER = 18
 
 MERGE_DIRS_isa-extra = $(bindir) $(libdir) $(sbindir) $(libexecdir)
@@ -85,11 +79,10 @@
 CSWmysql-dev_programs += mysql_config
 PKGFILES_CSWmysql-dev  += $(foreach bin_name,$(CSWmysql-dev_programs),$(call baseisadirs,$(bindir),$(bin_name)))
 PKGFILES_CSWmysql-dev  += $(foreach bin_name,$(CSWmysql-dev_programs),$(mandir)/man1/$(bin_name)\.1)
-PKGFILES_CSWmysql-dev  += $(foreach bin_name,$(CSWmysql-dev_programs),/opt/csw/bin/$(bin_name))
-PKGFILES_CSWmysql-dev  += $(foreach bin_name,$(CSWmysql-dev_programs),/opt/csw/sbin/$(bin_name))
+PKGFILES_CSWmysql-dev  += $(foreach bin_name,$(CSWmysql-dev_programs),$(bindir)/$(bin_name))
+PKGFILES_CSWmysql-dev  += $(foreach bin_name,$(CSWmysql-dev_programs),$(sbindir)/$(bin_name))
 PKGFILES_CSWmysql-dev  += $(mandir)/man1/mysql_config.*
 PKGFILES_CSWmysql-dev  += $(prefix)/include.*
-PKGFILES_CSWmysql-dev  += /opt/csw/include/mysql
 PATCHFILES += 0003-I-HATE-CMAKE.patch
 PATCHFILES += 0003-WHY-IS-CMAKE-TRYING-TO-BE-SMARTER-THAN-ME.patch
 PATCHFILES += 0003-Use-bash-for-mysqld_safe.patch
@@ -131,11 +124,8 @@
 PKGFILES_CSW$(NAME)client  = $(bindir)
 PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(client_programs),$(call baseisadirs,$(bindir),$(bin_name)))
 PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(client_programs),$(mandir)/man1/$(bin_name)\.1)
-PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(client_programs),/opt/csw/bin/$(bin_name))
-PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(client_programs),/opt/csw/sbin/$(bin_name))
-# RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibmysqlclient$(MYSQL_LIB_VER)
-# RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibmysqlclient-r$(MYSQL_LIB_VER)
-# RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibncursesw5
+PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(client_programs),$(bindir)/$(bin_name))
+PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(client_programs),$(sbindir)/$(bin_name))
 RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibz1
 RUNTIME_DEP_PKGS_CSW$(NAME)client_5.9 += CSWlibssl1-0-0
 RUNTIME_DEP_PKGS_CSW$(NAME)client_5.10 += CSWlibssl1-0-0
@@ -153,11 +143,8 @@
 CHECKPKG_OVERRIDES_CSWlibmysqlclient18 += bad-rpath-entry
 
 PACKAGES += CSW$(NAME)
-# RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibmysqlclient-r$(MYSQL_LIB_VER)
-# RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibmysqlclient$(MYSQL_LIB_VER)
 SPKG_DESC_CSW$(NAME) = Multithreaded SQL database
 RUNTIME_DEP_PKGS_CSW$(NAME) += CSW$(NAME)client
-# RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibwrap1
 RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibz1
 RUNTIME_DEP_PKGS_CSW$(NAME)_5.9 += CSWlibssl1-0-0
 RUNTIME_DEP_PKGS_CSW$(NAME)_5.10 += CSWlibssl1-0-0
@@ -188,12 +175,11 @@
 DISTFILES  = mysql-$(VERSION).tar.gz
 DISTFILES += csw$(NAME).tpl
 DISTFILES += quick_start-csw
-DISTFILES += README.CSW
-DISTFILES += ChangeLog
 DISTFILES += CSW$(NAME).preinstall
 DISTFILES += CSW$(NAME).postinstall
 DISTFILES += cswusergroup
 DISTFILES += map.mysql
+DISTFILES += README.CSW
 
 # TODO: Do the proper prerequsite pkgs.
 BUILD_DEP_PKGS += $(RUNTIME_DEP_PKGS)
@@ -204,12 +190,17 @@
 # http://forge.mysql.com/wiki/Autotools_to_CMake_Transition_Guide
 CMAKE_ARGS += -DCMAKE_INSTALL_PREFIX=$(prefix)
 CMAKE_ARGS += -DINSTALL_LAYOUT=RPM
-CMAKE_ARGS += -DMYSQL_DATADIR=$(localstatedir)
+CMAKE_ARGS += -DMYSQL_DATADIR=$(localstatedir)/$(NAME)
 CMAKE_ARGS += -DSYSCONFDIR=$(sysconfdir)
 CMAKE_ARGS += -DINSTALL_BINDIR=$(subst $(prefix)/,,$(bindir))
 CMAKE_ARGS += -DINSTALL_SBINDIR=$(subst $(prefix)/,,$(libexecdir))
 CMAKE_ARGS += -DINSTALL_LIBDIR=$(subst $(prefix)/,,$(libdir))
 CMAKE_ARGS += -DINSTALL_PLUGINDIR=$(subst $(prefix)/,,$(libdir))/$(NAME)/plugin
+CMAKE_ARGS += -DINSTALL_DOCDIR=$(subst $(prefix)/,,$(docdir))/$(NAME)
+CMAKE_ARGS += -DINSTALL_DOCREADMEDIR=$(subst $(prefix)/,,$(docdir))/$(NAME)
+CMAKE_ARGS += -DINSTALL_INFODIR=$(subst $(prefix)/,,$(infodir))/$(NAME)
+CMAKE_ARGS += -DINSTALL_MYSQLSHAREDIR=$(subst $(prefix)/,,$(sharedstatedir))/$(NAME)
+CMAKE_ARGS += -DINSTALL_SUPPORTFILESDIR=$(subst $(prefix)/,,$(sharedstatedir))/$(NAME)/support-files
 CMAKE_ARGS += -DWITH_LIBWRAP=1
 CMAKE_ARGS += -DWITH_SSL=system
 CMAKE_ARGS += -DWITH_ZLIB=system
@@ -224,7 +215,7 @@
 CMAKE_ARGS += -DCMAKE_PREFIX_PATH="$(prefix)"
 CMAKE_ARGS += -DCMAKE_INCLUDE_PATH="$(includedir)"
 CMAKE_ARGS += -DCMAKE_VERBOSE_MAKEFILE=ON
-CMAKE_ARGS += -DBISON_EXECUTABLE=/opt/csw/bin/bison
+CMAKE_ARGS += -DBISON_EXECUTABLE=$(prefix)/bin/bison
 
 # The line below come from the official MySQL build configuration
 CMAKE_ARGS += "-DENABLED_PROFILING:BOOL=ON"
@@ -249,11 +240,11 @@
 endif
 
 
-USERGROUP = /etc/opt/csw/pkg/CSW$(NAME)/cswusergroup
+USERGROUP = $(sysconfdir)/pkg/CSW$(NAME)/cswusergroup
 
-PROTOTYPE_MODIFIERS = dbdir
-PROTOTYPE_FILES_dbdir = $(localstatedir)
-PROTOTYPE_USER_dbdir = mysql
+PROTOTYPE_MODIFIERS   = dbdir
+PROTOTYPE_FILES_dbdir = $(localstatedir)/$(NAME)
+PROTOTYPE_USER_dbdir  = mysql
 PROTOTYPE_GROUP_dbdir = mysql
 PROTOTYPE_PERMS_dbdir = 0700
 PROTOTYPE_CLASS_dbdir = ugfiles
@@ -332,7 +323,7 @@
 post-configure-modulated:
 	gsed \
 		-e 's+ at prefix@+$(prefix)+g' \
-		-e 's+ at localstatedir@+$(localstatedir)+g' \
+		-e 's+ at localstatedir@+$(localstatedir)/$(NAME)+g' \
 		-e 's+ at sysconfdir@+$(sysconfdir)+g' \
 		-e 's+ at bindir@+$(bindir)+g' \
 		-e 's+ at BASE_VERSION@+$(BASE_VERSION)+g' \
@@ -350,15 +341,8 @@
 	@$(MAKECOOKIE)
 
 post-merge:
-	ginstall -m 755 -d $(PKGROOT)$(localstatedir)
-	ginstall -m 755 -d $(PKGROOT)$(datadir)/$(NAME)/doc
-	ginstall -m 644 $(FILEDIR)/ChangeLog $(PKGROOT)$(datadir)/$(NAME)/doc/ChangeLog-$(BASE_VERSION)
-	ginstall -m 644 $(FILEDIR)/README.CSW $(PKGROOT)$(datadir)/$(NAME)/doc/README-$(BASE_VERSION).CSW
-	ginstall -m 755 -d $(PKGROOT)/opt/csw/share/$(NAME)/doc
-	gln -sf ../../../$(NAME)/share/$(NAME)/doc/README-$(BASE_VERSION).CSW \
-		$(PKGROOT)/opt/csw/share/$(NAME)/doc/README-$(BASE_VERSION).CSW
-	# The quick_start-csw file is almost the same as postinstall.
-	# [ -d $(PKGROOT)$(datadir)/mysql ]
+	ginstall -m 755 -d $(PKGROOT)$(localstatedir)/$(NAME)
+	ginstall -m 755 -d $(PKGROOT)$(datadir)/doc/$(NAME)
 	ginstall -m 755 -d $(PKGROOT)$(sysconfdir)/pkg/CSW$(NAME)
 	ginstall -m 644 $(FILEDIR)/cswusergroup \
 		        $(PKGROOT)$(sysconfdir)/pkg/CSW$(NAME)

Deleted: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0001-Use-libc-not-libcrypt.patch
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0001-Use-libc-not-libcrypt.patch	2013-10-11 09:33:31 UTC (rev 22196)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0001-Use-libc-not-libcrypt.patch	2013-10-11 10:08:30 UTC (rev 22197)
@@ -1,28 +0,0 @@
-From 6925aace1b489a5ffb0265c7fdc7edc3def7d995 Mon Sep 17 00:00:00 2001
-From: Maciej Blizinski <maciej at opencsw.org>
-Date: Mon, 26 Jul 2010 08:03:17 +0200
-Subject: [PATCH] Use libc not libcrypt
-
----
- configure.in |    5 ++++-
- 1 files changed, 4 insertions(+), 1 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index 7374723..1c181c7 100644
---- a/configure.in
-+++ b/configure.in
-@@ -860,7 +860,10 @@ AC_SEARCH_LIBS(setsockopt, socket)
- # This may get things to compile even if bind-8 is installed
- AC_SEARCH_LIBS(bind, bind)
- # Check if crypt() exists in libc or libcrypt, sets LIBS if needed
--AC_SEARCH_LIBS(crypt, crypt, AC_DEFINE(HAVE_CRYPT, 1, [crypt]))
-+## AC_SEARCH_LIBS(crypt, crypt, AC_DEFINE(HAVE_CRYPT, 1, [crypt]))
-+# For crypt() on Solaris use libc, not libcrypt
-+AC_CHECK_LIB(c, crypt)
-+AC_CHECK_FUNC(crypt, AC_DEFINE([HAVE_CRYPT], [1], [crypt]))
- # See if we need a library for address lookup.
- AC_SEARCH_LIBS(inet_aton, [socket nsl resolv])
- 
--- 
-1.7.1
-

Deleted: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0002-cast-user_info-pw_gid-to-gid_t.patch
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0002-cast-user_info-pw_gid-to-gid_t.patch	2013-10-11 09:33:31 UTC (rev 22196)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0002-cast-user_info-pw_gid-to-gid_t.patch	2013-10-11 10:08:30 UTC (rev 22197)
@@ -1,27 +0,0 @@
-From 8536f5925a96634950decd8779b2c6a60d183134 Mon Sep 17 00:00:00 2001
-From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= <blizinski at google.com>
-Date: Wed, 16 Sep 2009 01:29:57 +0100
-Subject: [PATCH 2/4] cast user_info->pw_gid to gid_t
-
----
- sql/mysqld.cc |    4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git a/sql/mysqld.cc b/sql/mysqld.cc
-index 592ae3e..695fbb9 100644
---- a/sql/mysqld.cc
-+++ b/sql/mysqld.cc
-@@ -1436,7 +1436,9 @@ static void set_user(const char *user, struct passwd *user_info_arg)
-     output a specific message to help the user resolve this problem.
-   */
-   calling_initgroups= TRUE;
--  initgroups((char*) user, user_info_arg->pw_gid);
-+/* Solaris patch */
-+/*  initgroups((char*) user, user_info->pw_gid); */
-+  initgroups((char*) user,(gid_t) user_info->pw_gid);
-   calling_initgroups= FALSE;
- #endif
-   if (setgid(user_info_arg->pw_gid) == -1)
--- 
-1.6.3.2
-

Deleted: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0002-stop-cmake-from-messing-with-cflags.patch
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0002-stop-cmake-from-messing-with-cflags.patch	2013-10-11 09:33:31 UTC (rev 22196)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0002-stop-cmake-from-messing-with-cflags.patch	2013-10-11 10:08:30 UTC (rev 22197)
@@ -1,29 +0,0 @@
-From 813fc9123c5b461d1f06b56c7398f28d56a3f1dd Mon Sep 17 00:00:00 2001
-From: Maciej Blizinski <maciej at opencsw.org>
-Date: Sun, 9 Oct 2011 09:25:28 +0200
-Subject: [PATCH] stop cmake from messing with cflags
-
----
- cmake/os/SunOS.cmake |    5 -----
- 1 files changed, 0 insertions(+), 5 deletions(-)
-
-diff --git a/cmake/os/SunOS.cmake b/cmake/os/SunOS.cmake
-index 3d2b4b8..300d20e 100644
---- a/cmake/os/SunOS.cmake
-+++ b/cmake/os/SunOS.cmake
-@@ -84,12 +84,7 @@ IF(CMAKE_COMPILER_IS_GNUCC AND CMAKE_SIZEOF_VOID_P EQUAL 4
-   } ")
-   CHECK_C_SOURCE_COMPILES(${SOURCE}  HAVE_SPARC32_TICK)
-   IF(NOT HAVE_SPARC32_TICK)
--    SET(CMAKE_REQUIRED_FLAGS "-mcpu=v9")
-     CHECK_C_SOURCE_COMPILES(${SOURCE}  HAVE_SPARC32_TICK_WITH_V9)
-     SET(CMAKE_REQUIRED_FLAGS)
--    IF(HAVE_SPARC32_TICK_WITH_V9)
--      SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mcpu=v9")
--      SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mcpu=v9")
--    ENDIF()
-   ENDIF()
- ENDIF()
--- 
-1.7.6.1
-

Deleted: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0003-OpenCSW-perl-for-tests.patch
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0003-OpenCSW-perl-for-tests.patch	2013-10-11 09:33:31 UTC (rev 22196)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0003-OpenCSW-perl-for-tests.patch	2013-10-11 10:08:30 UTC (rev 22197)
@@ -1,22 +0,0 @@
-From bd9a3ff419f5a614d584aa6156a512e69f470e0f Mon Sep 17 00:00:00 2001
-From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= <blizinski at google.com>
-Date: Wed, 16 Sep 2009 01:36:09 +0100
-Subject: [PATCH 3/4] OpenCSW perl for tests
-
----
- mysql-test/mysql-test-run.pl |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
-index f60701b..cd9f843 100755
---- a/mysql-test/mysql-test-run.pl
-+++ b/mysql-test/mysql-test-run.pl
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl
-+#!/opt/csw/bin/perl
- # -*- cperl -*-
- 
- #
--- 
-1.6.3.2
-

Deleted: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0004-looking-for-ps-use-basename-0.patch
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0004-looking-for-ps-use-basename-0.patch	2013-10-11 09:33:31 UTC (rev 22196)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0004-looking-for-ps-use-basename-0.patch	2013-10-11 10:08:30 UTC (rev 22197)
@@ -1,48 +0,0 @@
-From 111c7574ea02e17df8b2aff8e1b94d6118024f7b Mon Sep 17 00:00:00 2001
-From: Maciej Blizinski <maciej at opencsw.org>
-Date: Wed, 28 Sep 2011 23:26:47 +0200
-Subject: [PATCH] looking for ps, use `basename $0`
-
-Upstream bug filed:
-http://bugs.mysql.com/bug.php?id=62567
-
----
- configure.in |   10 +++++-----
- 1 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index cfae77d..8e6dd43 100644
---- a/configure.in
-+++ b/configure.in
-@@ -518,23 +518,23 @@ AC_PATH_PROG(PS, ps, ps)
- AC_MSG_CHECKING("how to check if pid exists")
- PS=$ac_cv_path_PS
- # Linux style
--if $PS wwwp $$ 2> /dev/null | grep -- "$0" > /dev/null
-+if $PS wwwp $$ 2> /dev/null | grep -- "`basename $0`" > /dev/null
- then
-   FIND_PROC="$PS wwwp \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null"
- # Solaris
--elif $PS -fp $$ 2> /dev/null | grep -- $0 > /dev/null
-+elif $PS -fp $$ 2> /dev/null | grep -- `basename $0` > /dev/null
- then
-   FIND_PROC="$PS -p \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null"
- # BSD style
--elif $PS -uaxww 2> /dev/null | grep -- $0 > /dev/null
-+elif $PS -uaxww 2> /dev/null | grep -- `basename $0` > /dev/null
- then
-   FIND_PROC="$PS -uaxww | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" | grep \" \$\$PID \" > /dev/null"
- # SysV style
--elif $PS -ef 2> /dev/null | grep -- $0 > /dev/null
-+elif $PS -ef 2> /dev/null | grep -- `basename $0` > /dev/null
- then
-   FIND_PROC="$PS -ef | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" | grep \" \$\$PID \" > /dev/null"
- # Do anybody use this?
--elif $PS $$ 2> /dev/null | grep -- $0 > /dev/null
-+elif $PS $$ 2> /dev/null | grep -- `basename $0` > /dev/null
- then
-   FIND_PROC="$PS \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null"
- else
--- 
-1.7.6.1
-

Deleted: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0004-var-opt-csw-mysql51-for-datadir-in-my-.cnf.patch
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0004-var-opt-csw-mysql51-for-datadir-in-my-.cnf.patch	2013-10-11 09:33:31 UTC (rev 22196)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0004-var-opt-csw-mysql51-for-datadir-in-my-.cnf.patch	2013-10-11 10:08:30 UTC (rev 22197)
@@ -1,81 +0,0 @@
-From b46fd72320554ec86a256a859006a04de8e68564 Mon Sep 17 00:00:00 2001
-From: Maciej Blizinski <maciej at opencsw.org>
-Date: Thu, 12 Aug 2010 12:00:14 +0200
-Subject: [PATCH] /var/opt/csw/mysql51 for datadir in my-*.cnf
-
----
- support-files/my-huge.cnf.sh            |    2 ++
- support-files/my-innodb-heavy-4G.cnf.sh |    2 ++
- support-files/my-large.cnf.sh           |    2 ++
- support-files/my-medium.cnf.sh          |    2 ++
- support-files/my-small.cnf.sh           |    2 ++
- 5 files changed, 10 insertions(+), 0 deletions(-)
-
-diff --git a/support-files/my-huge.cnf.sh b/support-files/my-huge.cnf.sh
-index 17a7ddb..51c0531 100644
---- a/support-files/my-huge.cnf.sh
-+++ b/support-files/my-huge.cnf.sh
-@@ -23,6 +23,8 @@ socket		= @MYSQL_UNIX_ADDR@
- 
- # The MySQL server
- [mysqld]
-+basedir         = /opt/csw/mysql51
-+datadir         = /var/opt/csw/mysql51
- port		= @MYSQL_TCP_PORT@
- socket		= @MYSQL_UNIX_ADDR@
- skip-locking
-diff --git a/support-files/my-innodb-heavy-4G.cnf.sh b/support-files/my-innodb-heavy-4G.cnf.sh
-index e9390a5..fb62231 100644
---- a/support-files/my-innodb-heavy-4G.cnf.sh
-+++ b/support-files/my-innodb-heavy-4G.cnf.sh
-@@ -39,6 +39,8 @@ socket		= @MYSQL_UNIX_ADDR@
- # The MySQL server
- #
- [mysqld]
-+basedir         = /opt/csw/mysql51
-+datadir         = /var/opt/csw/mysql51
- 
- # generic configuration options
- port		= @MYSQL_TCP_PORT@
-diff --git a/support-files/my-large.cnf.sh b/support-files/my-large.cnf.sh
-index bbdfdb3..f3dec5d 100644
---- a/support-files/my-large.cnf.sh
-+++ b/support-files/my-large.cnf.sh
-@@ -23,6 +23,8 @@ socket		= @MYSQL_UNIX_ADDR@
- 
- # The MySQL server
- [mysqld]
-+basedir         = /opt/csw/mysql51
-+datadir         = /var/opt/csw/mysql51
- port		= @MYSQL_TCP_PORT@
- socket		= @MYSQL_UNIX_ADDR@
- skip-locking
-diff --git a/support-files/my-medium.cnf.sh b/support-files/my-medium.cnf.sh
-index 88113d0..18f6405 100644
---- a/support-files/my-medium.cnf.sh
-+++ b/support-files/my-medium.cnf.sh
-@@ -24,6 +24,8 @@ socket		= @MYSQL_UNIX_ADDR@
- 
- # The MySQL server
- [mysqld]
-+basedir         = /opt/csw/mysql51
-+datadir         = /var/opt/csw/mysql51
- port		= @MYSQL_TCP_PORT@
- socket		= @MYSQL_UNIX_ADDR@
- skip-locking
-diff --git a/support-files/my-small.cnf.sh b/support-files/my-small.cnf.sh
-index 3bfa08d..a20fdc5 100644
---- a/support-files/my-small.cnf.sh
-+++ b/support-files/my-small.cnf.sh
-@@ -24,6 +24,8 @@ socket		= @MYSQL_UNIX_ADDR@
- 
- # The MySQL server
- [mysqld]
-+basedir         = /opt/csw/mysql51
-+datadir         = /var/opt/csw/mysql51
- port		= @MYSQL_TCP_PORT@
- socket		= @MYSQL_UNIX_ADDR@
- skip-locking
--- 
-1.7.1
-

Deleted: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0005_my_vsnprintf-t_fails_bug_62572.patch
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0005_my_vsnprintf-t_fails_bug_62572.patch	2013-10-11 09:33:31 UTC (rev 22196)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0005_my_vsnprintf-t_fails_bug_62572.patch	2013-10-11 10:08:30 UTC (rev 22197)
@@ -1,14 +0,0 @@
---- a/unittest/mysys/my_vsnprintf-t.c.original	lun. mars 25 14:14:58 2013
-+++ b/unittest/mysys/my_vsnprintf-t.c	jeu. mai  16 15:35:30 2013
-@@ -31,7 +31,11 @@
- 
- int main(void)
- {
-+#if defined (__GNUC__)
-   plan(58);
-+#else
-+  plan(57);
-+#endif
- 
-   test1("Constant string",
-         "Constant string");

Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/CSWmysql5.postinstall
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/CSWmysql5.postinstall	2013-10-11 09:33:31 UTC (rev 22196)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/CSWmysql5.postinstall	2013-10-11 10:08:30 UTC (rev 22197)
@@ -15,8 +15,9 @@
 MYSQL_HOME="/var${prefix}/mysql5"
 sysconfdir="/etc${prefix}"
 # https://www.opencsw.org/mantis/view.php?id=4646
-DEFAULTS_FILE="${prefix}/share/mysql/my-small.cnf"
+DEFAULTS_FILE="${prefix}/share/mysql5/support-files/my-small.cnf
 MYSQLD_USER="mysql"
+MYSQLD_GROUP="mysql"
 # Provide the default data directory
 MYSQLD_DATADIR="${MYSQL_HOME}"
 DEPRECATED_DEFAULTS_FILE="${BASEDIR}/my.cnf"
@@ -32,7 +33,7 @@
 fi
 
 if [ ! -f "$DEFAULTS_FILE" ]; then
-    IN_DEFAULTS_FILE=$BASEDIR/share/mysql/my-small.cnf
+    IN_DEFAULTS_FILE=$BASEDIR/share/mysql5/support-files/my-small.cnf
     echo "Using $IN_DEFAULTS_FILE to create the options file."
 else
     IN_DEFAULTS_FILE=$DEFAULTS_FILE
@@ -49,7 +50,7 @@
 # Create the database directory and set the permissions if needed
 if [ ! -d "$MYSQLD_DATADIR" ] ; then
     mkdir -p $MYSQLD_DATADIR
-    chown -R mysql:mysql $MYSQLD_DATADIR
+    chown -R ${MYSQLD_USER}:${MYSQLD_GROUP} $MYSQLD_DATADIR
     chmod 0700 $MYSQLD_DATADIR
 fi
 #
@@ -72,7 +73,7 @@
 
 # Fix permissions on the data directory, since mysql_install_db was run as
 # root.
-chown -R ${MYSQLD_USER}:mysql $MYSQLD_DATADIR
+chown -R ${MYSQLD_USER}:${MYSQLD_GROUP} $MYSQLD_DATADIR
 
 # Update --datadir in the cnf file with the correct value if file was copied
 if [ x"$CNFCOPIED" = xyes ]; then
@@ -83,10 +84,9 @@
 # Ending message
 echo
 echo "###  The following messages are from $0."
-echo "See /opt/csw/mysql5/share/mysql/doc/README.CSW for packaging changes."
+echo "See ${prefix}/share/doc/mysql5/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 "  These messages are from mysql_install_db."
 
 exit 0
 

Deleted: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/ChangeLog
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/ChangeLog	2013-10-11 09:33:31 UTC (rev 22196)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/ChangeLog	2013-10-11 10:08:30 UTC (rev 22197)
@@ -1,37 +0,0 @@
-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.

Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/README.CSW
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/README.CSW	2013-10-11 09:33:31 UTC (rev 22196)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/README.CSW	2013-10-11 10:08:30 UTC (rev 22197)
@@ -1,12 +1,18 @@
-[[needs review]]
 
-MySQL 5.5 OpenCSW package
-=======================
+  MySQL 5.5 OpenCSW package
+  =========================
 
-* Read only /opt/csw support
-  - data in /var/opt/csw
-  - configuration in /etc/opt/csw
-* The prefix is /opt/csw, and all the binaries are now in
-  /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
+  * Read only /opt/csw support
+    - data in /var/opt/csw/mysql5
+    - configuration in /etc/opt/csw/my.cnf
+  * The prefix is /opt/csw, and all the client binaries are now in
+    /opt/csw, so that the standard PATH setting allows to use them.
+  * The server binaries are in /opt/csw/libexec for the 32 bit one and
+    /opt/csw/libexec/0amd64|sparcv9] for the 64 bit one.
+  * The startup script is now in /etc/opt/csw/init.d
+  * SMF support is handled by cswclassutils
+    Running MySQL is handled by the cswmysql5 service in Solaris >= 10,
+    and the traditional /etc/init.d/cswmysql5 in Solaris 9.
+  * The preferred architecture can be set using mysql5_arch=<arch> in csw.conf:
+    the default is to use the kernel's.
+

Modified: csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile	2013-10-11 09:33:31 UTC (rev 22196)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile	2013-10-11 10:08:30 UTC (rev 22197)
@@ -61,11 +61,6 @@
 
 INITSMF = $(sysconfdir)/init\.d/csw$(NAME)
 
-# Existing databases are in this location
-localstatedir = /var$(BUILD_PREFIX)/$(NAME)
-# To avoid file conflicts
-# datadir = $(prefix)/share/mysql/$(BASE_VERSION)
-
 MYSQL_LIB_VER = 18
 
 MERGE_DIRS_isa-extra = $(bindir) $(libdir) $(sbindir) $(libexecdir)
@@ -78,11 +73,10 @@
 CSWmysql-dev_programs += mysql_config
 PKGFILES_CSWmysql-dev  += $(foreach bin_name,$(CSWmysql-dev_programs),$(call baseisadirs,$(bindir),$(bin_name)))
 PKGFILES_CSWmysql-dev  += $(foreach bin_name,$(CSWmysql-dev_programs),$(mandir)/man1/$(bin_name)\.1)
-PKGFILES_CSWmysql-dev  += $(foreach bin_name,$(CSWmysql-dev_programs),/opt/csw/bin/$(bin_name))
-PKGFILES_CSWmysql-dev  += $(foreach bin_name,$(CSWmysql-dev_programs),/opt/csw/sbin/$(bin_name))
+PKGFILES_CSWmysql-dev  += $(foreach bin_name,$(CSWmysql-dev_programs),$(bindir)/$(bin_name))
+PKGFILES_CSWmysql-dev  += $(foreach bin_name,$(CSWmysql-dev_programs),$(sbindir)/$(bin_name))
 PKGFILES_CSWmysql-dev  += $(mandir)/man1/mysql_config.*
 PKGFILES_CSWmysql-dev  += $(prefix)/include.*
-PKGFILES_CSWmysql-dev  += /opt/csw/include/mysql
 
 PACKAGES += CSWlibmysqlclient$(MYSQL_LIB_VER)
 PKGFILES_CSWlibmysqlclient$(MYSQL_LIB_VER) += $(call baseisadirs,$(libdir),libmysqlclient\.so\.$(MYSQL_LIB_VER)(\.\d+)*)
@@ -114,13 +108,14 @@
 client_programs += perror
 client_programs += replace
 
+ISAEXEC_CSW$(NAME)client = 1
 PACKAGES += CSW$(NAME)client
 SPKG_DESC_CSW$(NAME)client = MySQL $(BASE_VERSION) client binaries
 PKGFILES_CSW$(NAME)client  = $(bindir)
 PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(client_programs),$(call baseisadirs,$(bindir),$(bin_name)))
 PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(client_programs),$(mandir)/man1/$(bin_name)\.1)
-PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(client_programs),/opt/csw/bin/$(bin_name))
-PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(client_programs),/opt/csw/sbin/$(bin_name))
+PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(client_programs),$(bindir)/$(bin_name))
+PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(client_programs),$(sbindir)/$(bin_name))
 RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibz1
 RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibssl1-0-0
 CHECKPKG_OVERRIDES_CSW$(NAME)client += bad-rpath-entry
@@ -154,28 +149,33 @@
 DISTFILES  = mysql-$(VERSION).tar.gz
 DISTFILES += csw$(NAME).tpl
 DISTFILES += quick_start-csw
-DISTFILES += README.CSW
-DISTFILES += ChangeLog
 DISTFILES += CSW$(NAME).preinstall
 DISTFILES += CSW$(NAME).postinstall
 DISTFILES += cswusergroup
 DISTFILES += map.mysql
+DISTFILES += README.CSW
 
 # TODO: Do the proper prerequsite pkgs.
 BUILD_DEP_PKGS += $(RUNTIME_DEP_PKGS)
 BUILD_DEP_PKGS += CSWcmake
 BUILD_DEP_PKGS += CSWbison
+BUILD_DEP_PKGS += CSWlibwrap-dev
 
 # http://forge.mysql.com/wiki/Autotools_to_CMake_Transition_Guide
 CMAKE_ARGS += -DCMAKE_INSTALL_PREFIX=$(prefix)
 CMAKE_ARGS += "-DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON"
 CMAKE_ARGS += -DINSTALL_LAYOUT=RPM
-CMAKE_ARGS += -DMYSQL_DATADIR=$(localstatedir)
+CMAKE_ARGS += -DMYSQL_DATADIR=$(localstatedir)/$(NAME)
 CMAKE_ARGS += -DSYSCONFDIR=$(sysconfdir)
 CMAKE_ARGS += -DINSTALL_BINDIR=$(subst $(prefix)/,,$(bindir))
 CMAKE_ARGS += -DINSTALL_SBINDIR=$(subst $(prefix)/,,$(libexecdir))
 CMAKE_ARGS += -DINSTALL_LIBDIR=$(subst $(prefix)/,,$(libdir))
 CMAKE_ARGS += -DINSTALL_PLUGINDIR=$(subst $(prefix)/,,$(libdir))/$(NAME)/plugin
+CMAKE_ARGS += -DINSTALL_DOCDIR=$(subst $(prefix)/,,$(docdir))/$(NAME)
+CMAKE_ARGS += -DINSTALL_DOCREADMEDIR=$(subst $(prefix)/,,$(docdir))/$(NAME)
+CMAKE_ARGS += -DINSTALL_INFODIR=$(subst $(prefix)/,,$(infodir))/$(NAME)
+CMAKE_ARGS += -DINSTALL_MYSQLSHAREDIR=$(subst $(prefix)/,,$(sharedstatedir))/$(NAME)
+CMAKE_ARGS += -DINSTALL_SUPPORTFILESDIR=$(subst $(prefix)/,,$(sharedstatedir))/$(NAME)/support-files
 CMAKE_ARGS += -DWITH_LIBWRAP=1
 CMAKE_ARGS += -DWITH_SSL=system
 CMAKE_ARGS += -DWITH_ZLIB=system
@@ -192,7 +192,7 @@
 CMAKE_ARGS += -DCMAKE_PREFIX_PATH="$(prefix)"
 CMAKE_ARGS += -DCMAKE_INCLUDE_PATH="$(includedir)"
 CMAKE_ARGS += -DCMAKE_VERBOSE_MAKEFILE=ON
-CMAKE_ARGS += -DBISON_EXECUTABLE=/opt/csw/bin/bison
+CMAKE_ARGS += -DBISON_EXECUTABLE=$(prefix)/bin/bison
 
 # The line below come from the official MySQL build configuration
 CMAKE_ARGS += "-DENABLED_PROFILING:BOOL=ON"
@@ -227,11 +227,11 @@
 CMAKE_ARGS += "-DWITH_VALGRIND:BOOL=OFF"
 CMAKE_ARGS += "-DENABLE_DTRACE:BOOL=ON"
 
-USERGROUP = /etc/opt/csw/pkg/CSW$(NAME)/cswusergroup
+USERGROUP = $(sysconfdir)/pkg/CSW$(NAME)/cswusergroup
 
-PROTOTYPE_MODIFIERS = dbdir
-PROTOTYPE_FILES_dbdir = $(localstatedir)
-PROTOTYPE_USER_dbdir = mysql
+PROTOTYPE_MODIFIERS   = dbdir
+PROTOTYPE_FILES_dbdir = $(localstatedir)/$(NAME)
+PROTOTYPE_USER_dbdir  = mysql
 PROTOTYPE_GROUP_dbdir = mysql
 PROTOTYPE_PERMS_dbdir = 0700
 PROTOTYPE_CLASS_dbdir = ugfiles
@@ -304,7 +304,7 @@
 post-configure-modulated:
 	gsed \
 		-e 's+ at prefix@+$(prefix)+g' \
-		-e 's+ at localstatedir@+$(localstatedir)+g' \
+		-e 's+ at localstatedir@+$(localstatedir)/$(NAME)+g' \
 		-e 's+ at sysconfdir@+$(sysconfdir)+g' \
 		-e 's+ at bindir@+$(bindir)+g' \
 		-e 's+ at BASE_VERSION@+$(BASE_VERSION)+g' \
@@ -324,15 +324,8 @@
 	@$(MAKECOOKIE)
 
 post-merge:
-	ginstall -m 755 -d $(PKGROOT)$(localstatedir)
-	ginstall -m 755 -d $(PKGROOT)$(datadir)/$(NAME)/doc
-	ginstall -m 644 $(FILEDIR)/ChangeLog $(PKGROOT)$(datadir)/$(NAME)/doc/ChangeLog-$(BASE_VERSION)
-	ginstall -m 644 $(FILEDIR)/README.CSW $(PKGROOT)$(datadir)/$(NAME)/doc/README-$(BASE_VERSION).CSW
-	ginstall -m 755 -d $(PKGROOT)/opt/csw/share/$(NAME)/doc
-	gln -sf ../../../$(NAME)/share/$(NAME)/doc/README-$(BASE_VERSION).CSW \
-		$(PKGROOT)/opt/csw/share/$(NAME)/doc/README-$(BASE_VERSION).CSW
-	# The quick_start-csw file is almost the same as postinstall.
-	# [ -d $(PKGROOT)$(datadir)/mysql ]
+	ginstall -m 755 -d $(PKGROOT)$(localstatedir)/$(NAME)
+	ginstall -m 755 -d $(PKGROOT)$(datadir)/doc/$(NAME)
 	ginstall -m 755 -d $(PKGROOT)$(sysconfdir)/pkg/CSW$(NAME)
 	ginstall -m 644 $(FILEDIR)/cswusergroup \
 		        $(PKGROOT)$(sysconfdir)/pkg/CSW$(NAME)

Modified: csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/CSWmysql5.postinstall
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/CSWmysql5.postinstall	2013-10-11 09:33:31 UTC (rev 22196)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/CSWmysql5.postinstall	2013-10-11 10:08:30 UTC (rev 22197)
@@ -15,8 +15,9 @@
 MYSQL_HOME="/var${prefix}/mysql5"
 sysconfdir="/etc${prefix}"
 # https://www.opencsw.org/mantis/view.php?id=4646
-DEFAULTS_FILE="${prefix}/share/mysql/my-small.cnf"
+DEFAULTS_FILE="${prefix}/share/mysql5/support-files/my-small.cnf
 MYSQLD_USER="mysql"
+MYSQLD_GROUP="mysql"
 # Provide the default data directory
 MYSQLD_DATADIR="${MYSQL_HOME}"
 DEPRECATED_DEFAULTS_FILE="${BASEDIR}/my.cnf"
@@ -32,7 +33,7 @@
 fi
 
 if [ ! -f "$DEFAULTS_FILE" ]; then
-    IN_DEFAULTS_FILE=$BASEDIR/share/mysql/my-small.cnf
+    IN_DEFAULTS_FILE=$BASEDIR/share/mysql5/support-files/my-small.cnf
     echo "Using $IN_DEFAULTS_FILE to create the options file."
 else
     IN_DEFAULTS_FILE=$DEFAULTS_FILE
@@ -49,7 +50,7 @@
 # Create the database directory and set the permissions if needed
 if [ ! -d "$MYSQLD_DATADIR" ] ; then
     mkdir -p $MYSQLD_DATADIR
-    chown -R mysql:mysql $MYSQLD_DATADIR
+    chown -R ${MYSQLD_USER}:${MYSQLD_GROUP} $MYSQLD_DATADIR
     chmod 0700 $MYSQLD_DATADIR
 fi
 #
@@ -72,7 +73,7 @@
 
 # Fix permissions on the data directory, since mysql_install_db was run as
 # root.
-chown -R ${MYSQLD_USER}:mysql $MYSQLD_DATADIR
+chown -R ${MYSQLD_USER}:${MYSQLD_GROUP} $MYSQLD_DATADIR
 
 # Update --datadir in the cnf file with the correct value if file was copied
 if [ x"$CNFCOPIED" = xyes ]; then
@@ -83,10 +84,9 @@
 # Ending message
 echo
 echo "###  The following messages are from $0."
-echo "See /opt/csw/mysql5/share/mysql/doc/README.CSW for packaging changes."
+echo "See ${prefix}/share/doc/mysql5/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 "  These messages are from mysql_install_db."
 
 exit 0
 

Modified: csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/README.CSW
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/README.CSW	2013-10-11 09:33:31 UTC (rev 22196)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/README.CSW	2013-10-11 10:08:30 UTC (rev 22197)
@@ -1,12 +1,18 @@
-[[needs review]]
 
-MySQL 5.5 OpenCSW package
-=======================
+  MySQL 5.5 OpenCSW package
+  =========================
 
-* Read only /opt/csw support
-  - data in /var/opt/csw
-  - configuration in /etc/opt/csw
-* The prefix is /opt/csw, and all the binaries are now in
-  /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
+  * Read only /opt/csw support
+    - data in /var/opt/csw/mysql5
+    - configuration in /etc/opt/csw/my.cnf
+  * The prefix is /opt/csw, and all the client binaries are now in
+    /opt/csw, so that the standard PATH setting allows to use them.
+  * The server binaries are in /opt/csw/libexec for the 32 bit one and
+    /opt/csw/libexec/0amd64|sparcv9] for the 64 bit one.
+  * The startup script is now in /etc/opt/csw/init.d
+  * SMF support is handled by cswclassutils
+    Running MySQL is handled by the cswmysql5 service in Solaris >= 10,
+    and the traditional /etc/init.d/cswmysql5 in Solaris 9.
+  * The preferred architecture can be set using mysql5_arch=<arch> in csw.conf:
+    the default is to use the kernel's.
+

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