Import of pkgsrc-2015Q1

databases/mysql56-server/MESSAGE.sphinx

@@ -0,0 +1,14 @@
+===========================================================================
+$NetBSD: MESSAGE.sphinx,v 1.1 2014/10/17 17:07:45 fhajny Exp $
+
+To install the SphinxSE MySQL plugin, log into your MySQL console
+and issue the following query:
+
+  INSTALL PLUGIN sphinx SONAME 'ha_sphinx.so';
+
+You can verify it has been loaded properly by checking whether
+it shows up in the list when list your engines:
+
+  SHOW ENGINES;
+
+===========================================================================

databases/mysql56-server/Makefile

@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2014/03/11 14:34:36 jperkin Exp $
+# $NetBSD: Makefile,v 1.23 2015/03/22 07:44:44 fhajny Exp $
 
 PKGNAME=	${DISTNAME:S/-/-server-/}
-SVR4_PKGNAME=	mysqs
+PKGREVISION=	1
 COMMENT=	MySQL 5, a free SQL database (server)
 
 CONFLICTS=	mysql3-server-[0-9]*
@@ -51,6 +51,7 @@ SMF_METHODS=		${RCD_SCRIPTS}
 FILES_SUBST+=		HOSTNAME_CMD=${HOSTNAME_CMD:Q}
 FILES_SUBST+=		MYSQL_DATADIR=${MYSQL_DATADIR}
 FILES_SUBST+=		MYSQL_USER=${MYSQL_USER} MYSQL_GROUP=${MYSQL_GROUP}
+FILES_SUBST+=		MYSQL_PIDFILE=${MYSQL_PIDFILE}
 MESSAGE_SUBST+=		MYSQL_DATADIR=${MYSQL_DATADIR}
 MESSAGE_SUBST+=		MYSQL_USER=${MYSQL_USER} MYSQL_GROUP=${MYSQL_GROUP}
 BUILD_DEFS+=		MYSQL_DATADIR
@@ -67,6 +68,16 @@ REPLACE_PERL+=		mysql-test/suite/funcs_2/lib/gen_charset_utf8.pl
 REPLACE_PERL+=		mysql-test/suite/rpl/extension/bhs.pl
 REPLACE_PERL+=		mysql-test/suite/rpl/extension/checksum.pl
 
+REPLACE_SH+=		mysql-test/suite/rpl/t/rpl_loaddata_symlink-master.sh
+REPLACE_SH+=		mysql-test/suite/rpl/t/rpl_loaddata_symlink-slave.sh
+REPLACE_SH+=		mysql-test/suite/rpl/t/rpl_misc_functions-slave.sh
+REPLACE_SH+=		mysql-test/t/long_tmpdir-master.sh
+REPLACE_SH+=		mysql-test/t/lowercase_mixed_tmpdir-master.sh
+REPLACE_SH+=		mysql-test/t/lowercase_mixed_tmpdir_innodb-master.sh
+
+CHECK_INTERPRETER_SKIP+=share/mysql/test/std_data/dtrace.d \
+			share/mysql/test/suite/opt_trace/validate_json.py
+
 # Replace interpreter without pulling in Python dependecy
 # Update when PYTHON_VERSION_DEFAULT changes!
 SUBST_CLASSES+=		python
@@ -75,7 +86,7 @@ SUBST_STAGE.python=	pre-configure
 SUBST_FILES.python+=	mysql-test/suite/opt_trace/validate_json.py
 SUBST_SED.python+=	-e 's,/usr/bin/python,${PREFIX}/bin/python2.7,'
 
-INSTALLATION_DIRS=	bin
+INSTALLATION_DIRS+=	bin
 
 .include "../../mk/compiler.mk"
 

databases/mysql56-server/PLIST.SunOS

@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST.SunOS,v 1.1 2014/07/16 08:56:59 fhajny Exp $
+share/mysql/solaris/postinstall-solaris

databases/mysql56-server/files/mysqld.sh

@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: mysqld.sh,v 1.1 2013/02/13 21:00:10 adam Exp $
+# $NetBSD: mysqld.sh,v 1.3 2014/12/05 17:22:16 schmonz Exp $
 #
 # PROVIDE: mysqld
 # REQUIRE: DAEMON LOGIN mountall
@@ -14,7 +14,7 @@
 #
 #       mysqld_user="mysql"		# user to run mysqld as
 #       mysqld_datadir="/path/to/home"	# path to MySQL database directory
-#
+#	mysqld_pidfile="/path/to/p.pid"	# path to MySQL PID file
 
 if [ -f /etc/rc.subr ]; then
 	. /etc/rc.subr
@@ -27,6 +27,7 @@ procname="@PREFIX@/sbin/${name}"
 : ${mysqld_user:=@MYSQL_USER@}
 : ${mysqld_group:=@MYSQL_GROUP@}
 : ${mysqld_datadir:=@MYSQL_DATADIR@}
+: ${mysqld_pidfile:=@MYSQL_PIDFILE@}
 
 extra_commands="initdb"
 initdb_cmd="mysqld_initdb"
@@ -74,19 +75,21 @@ mysqld_start()
 	ulimit -n 4096
 	cd @PREFIX@
 	${command} --user=${mysqld_user} --datadir=${mysqld_datadir} \
-		   --pid-file=${pidfile} ${mysqld_flags} \
-		   ${thread_flags} &
+		   --pid-file=${mysqld_pidfile} ${mysqld_flags} \
+		   ${thread_flags} \
+		   2>&1 | logger -t nbmysqld_safe \
+		   &
 }
 
 if [ -f /etc/rc.subr -a -d /etc/rc.d -a -f /etc/rc.d/DAEMON ]; then
 	load_rc_config $name
-	pidfile="${mysqld_datadir}/`@HOSTNAME_CMD@`.pid"
+	pidfile="${mysqld_pidfile}"
 	run_rc_command "$1"
 else
 	if [ -f /etc/rc.conf ]; then
 		. /etc/rc.conf
 	fi
-	pidfile="${mysqld_datadir}/`@HOSTNAME_CMD@`.pid"
+	pidfile="${mysqld_pidfile}"
 	case "$1" in
 	initdb)
 		eval ${initdb_cmd}

databases/mysql56-server/files/smf/manifest.xml

@@ -10,7 +10,7 @@
     <dependency name='net' grouping='require_all' restart_on='none' type='service'>
       <service_fmri value='svc:/network/loopback' />
     </dependency>
-    <method_context project='mysql' working_directory='@MYSQL_DATADIR@'>
+    <method_context working_directory='@MYSQL_DATADIR@'>
       <method_credential user='@MYSQL_USER@' group='@MYSQL_GROUP@' />
       <method_environment>
         <envvar name='LD_PRELOAD_32' value='/usr/lib/extendedFILE.so.1' />