Attachment 170459 Details for Bug 205983 – backported fix from databases/mysql57

[patch] backported fix from databases/mysql57

bug205983.diff (text/plain), 2.62 KB, created by Markus Kohlmeyer on 2016-05-18 20:18:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Markus Kohlmeyer

Created: 2016-05-18 20:18:09 UTC

Size: 2.62 KB

patch

obsolete

>diff -Naur databases/mysql56-server/Makefile databases/mysql56-server/Makefile
>--- databases/mysql56-server/Makefile	2016-05-18 19:50:17.242668000 +0200
>+++ databases/mysql56-server/Makefile	2016-05-18 21:54:38.862133000 +0200
>@@ -90,6 +90,35 @@
> 		mysqltest.1 perror.1 replace.1 resolve_stack_dump.1 resolveip.1
> 
> CMAKE_ARGS+=	-DWITH_EMBEDDED_SERVER="ON"
>+
>+OPTIONS_GROUP=		STORAGE
>+OPTIONS_GROUP_STORAGE=	ARCHIVE BLACKHOLE EXAMPLE FEDERATED INNOBASE PARTITION PERFSCHEMA
>+OPTIONS_SUB=		YES
>+STORAGE_DESC=		Permissible "Storage Engines" (to compile statically into the server)
>+ARCHIVE_DESC=		Compile "Archive Storage" statically in server
>+BLACKHOLE_DESC=		Compile "Blackhole Storage" statically in server
>+EXAMPLE_DESC=		Compile "Example Storage" statically in server
>+FEDERATED_DESC=		Compile "Federated Storage" statically in server
>+INNOBASE_DESC=		Compile "InnoDB Storage" statically in server
>+PARTITION_DESC=		Compile "Partitioning support Storage" statically in server
>+PERFSCHEMA_DESC=	Compile "Performance Schema Storage" statically in server
>+
>+ARCHIVE_CMAKE_ON=	-DWITH_ARCHIVE_STORAGE_ENGINE=1
>+BLACKHOLE_CMAKE_ON=	-DWITH_BLACKHOLE_STORAGE_ENGINE=1
>+EXAMPLE_CMAKE_ON=	-DWITH_EXAMPLE_STORAGE_ENGINE=1
>+FEDERATED_CMAKE_ON=	-DWITH_FEDERATED_STORAGE_ENGINE=1
>+INNOBASE_CMAKE_ON=	-DWITH_INNOBASE_STORAGE_ENGINE=1
>+PARTITION_CMAKE_ON=	-DWITH_PARTITION_STORAGE_ENGINE=1
>+PERFSCHEMA_CMAKE_ON=	-DWITH_PERFSCHEMA_STORAGE_ENGINE=1
>+
>+OPTIONS_GROUP+=		FEATURES
>+OPTIONS_GROUP_FEATURES=	PERFSCHM
>+FEATURES_DESC=		Default features knobs
>+PERFSCHM_DESC=		Enable "Performance Schema" by default (High RAM usage)
>+OPTIONS_DEFAULT+=	PERFSCHM
>+
>+PERFSCHM_SUB_LIST+=	PERFSCHEMRC=""
>+PERFSCHM_SUB_LIST_OFF+=	PERFSCHEMRC="--skip-performance-schema"
> .endif
> 
> .include <bsd.port.pre.mk>
>diff -Naur databases/mysql56-server/files/mysql-server.in databases/mysql56-server/files/mysql-server.in
>--- databases/mysql56-server/files/mysql-server.in	2016-05-18 15:50:04.367120000 +0200
>+++ databases/mysql56-server/files/mysql-server.in	2016-05-18 22:03:20.693261000 +0200
>@@ -41,7 +41,7 @@
> : ${hostname:=`/bin/hostname`}
> pidfile=${mysql_pidfile:-"${mysql_dbdir}/${hostname}.pid"}
> command="/usr/sbin/daemon"
>-command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${mysql_optfile} --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args}"
>+command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${mysql_optfile} --basedir=%%PREFIX%% --datadir=${mysql_dbdir} --pid-file=${pidfile} --user=${mysql_user} ${mysql_args} %%PERFSCHEMRC%%"
> procname="%%PREFIX%%/libexec/mysqld"
> start_precmd="${name}_prestart"
> start_postcmd="${name}_poststart"

Flags:

rootservice: maintainer-approval? (ports-bugs)

Actions: View | Diff

Attachments on bug 205983: 170459