SF.net SVN: gar:[23206] csw/mgar/pkg/mysql5/branches/mysql-5.5.x

[lblume at users.sourceforge.net]

Revision: 23206
          http://sourceforge.net/p/gar/code/23206
Author:   lblume
Date:     2014-03-12 21:52:28 +0000 (Wed, 12 Mar 2014)
Log Message:
-----------
mysql5/branches/mysql-5.5.x: Initial DBs are not properly created on a clean install

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/quick_start-csw

Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile	2014-03-12 19:03:31 UTC (rev 23205)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile	2014-03-12 21:52:28 UTC (rev 23206)
@@ -241,6 +241,7 @@
 CMAKE_ARGS += -DMYSQL_DATADIR=$(localstatedir)/$(NAME)
 CMAKE_ARGS += -DSYSCONFDIR=$(sysconfdir)
 CMAKE_ARGS += -DINSTALL_BINDIR=$(subst $(prefix)/,,$(bindir))
+CMAKE_ARGS += -DINSTALL_SCRIPTDIR=$(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

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	2014-03-12 19:03:31 UTC (rev 23205)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/CSWmysql5.postinstall	2014-03-12 21:52:28 UTC (rev 23206)
@@ -67,9 +67,7 @@
 echo "###  The following messages are from mysql_install_db."
 "$BASEDIR/bin/mysql_install_db" \
     --defaults-extra-file="$DEFAULTS_FILE" \
-    --user="$MYSQLD_USER" \
-    --basedir="$BASEDIR" \
-    --datadir="$MYSQLD_DATADIR"
+    --user="$MYSQLD_USER"
 echo "### End mysql_install_db messages."
 
 # Fix permissions on the data directory, since mysql_install_db was run as

Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/quick_start-csw
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/quick_start-csw	2014-03-12 19:03:31 UTC (rev 23205)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/quick_start-csw	2014-03-12 21:52:28 UTC (rev 23206)
@@ -107,9 +107,7 @@
 echo "###  The following messages are from mysql_install_db."
 $MYSQL_HOME/bin/mysql_install_db \
     --defaults-extra-file=$DEFAULTS_FILE \
-    --user=$MYSQLD_USER \
-    --basedir=$MYSQL_HOME \
-    --datadir=$MYSQLD_DATADIR
+    --user=$MYSQLD_USER
 
 #
 # Fix permissions on the data directory

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