Attachment 166454 Details for Bug 205956 – patch solves this peroblem and some others too (merged with Steven's to solve orphaned file on mysql57-server)

[patch] patch solves this peroblem and some others too (merged with Steven's to solve orphaned file on mysql57-server)

patch-databases_mysql57.patch (text/plain), 4.83 KB, created by Mahdi Mokhtari on 2016-02-02 20:16:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mahdi Mokhtari

Created: 2016-02-02 20:16:41 UTC

Size: 4.83 KB

patch

obsolete

>Index: mysql57-client/files/patch-include_CMakeLists.txt
>===================================================================
>--- mysql57-client/files/patch-include_CMakeLists.txt	(.../ports-dev/databases)	(working copy)
>+++ mysql57-client/files/patch-include_CMakeLists.txt	(.../ports-dev-copy/databases)	(working copy)
>@@ -8,11 +8,4 @@
>    my_dbug.h 
>    m_string.h
>    my_sys.h 
>-@@ -68,7 +69,6 @@ SET(HEADERS 
>-   ${HEADERS_GEN_CONFIGURE}
>- )
>- 
>--INSTALL(FILES ../libbinlogevents/export/binary_log_types.h DESTINATION ${INSTALL_INCLUDEDIR})
>- INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development)
>- INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR}/mysql COMPONENT Development 
>-  PATTERN "*.h"
>+
>Index: mysql57-client/pkg-plist
>===================================================================
>--- mysql57-client/pkg-plist	(.../ports-dev/databases)	(working copy)
>+++ mysql57-client/pkg-plist	(.../ports-dev-copy/databases)	(working copy)
>@@ -10,6 +10,7 @@
> bin/mysqlpump
> bin/mysqlshow
> bin/mysqlslap
>+include/mysql/binary_log_types.h
> include/mysql/big_endian.h
> include/mysql/byte_order_generic.h
> include/mysql/byte_order_generic_x86.h
>Index: mysql57-server/Makefile
>===================================================================
>--- mysql57-server/Makefile	(.../ports-dev/databases)	(working copy)
>+++ mysql57-server/Makefile	(.../ports-dev-copy/databases)	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	mysql
> PORTVERSION=	5.7.10
>-PORTREVISION=	1
>+PORTREVISION?=	3
> CATEGORIES=	databases ipv6
> MASTER_SITES=	MYSQL/MySQL-5.7:MySQL SF/boost/boost/1.59.0:boost
> PKGNAMESUFFIX?=	57-server
>@@ -117,7 +117,7 @@
> .endif
> 
> post-extract:
>-	${RM} -rvf ${WRKSRC}/sql/sql_hints.yy.cc ${WRKSRC}/sql/sql_hints.yy.h
>+	@${RM} -rvf ${WRKSRC}/sql/sql_hints.yy.cc ${WRKSRC}/sql/sql_hints.yy.h
> 
> post-patch:
> 	@${REINPLACE_CMD} 's/*.1/${MMAN1}/' ${WRKSRC}/man/CMakeLists.txt
>Index: mysql57-server/files/mysql-server.in
>===================================================================
>--- mysql57-server/files/mysql-server.in	(.../ports-dev/databases)	(working copy)
>+++ mysql57-server/files/mysql-server.in	(.../ports-dev-copy/databases)	(working copy)
>@@ -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} --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args} --skip-performance-schema"
> procname="%%PREFIX%%/libexec/mysqld"
> start_precmd="${name}_prestart"
> start_postcmd="${name}_poststart"
>Index: mysql57-server/files/patch-include_CMakeLists.txt
>===================================================================
>--- mysql57-server/files/patch-include_CMakeLists.txt	(.../ports-dev/databases)	(working copy)
>+++ mysql57-server/files/patch-include_CMakeLists.txt	(.../ports-dev-copy/databases)	(working copy)
>@@ -2,9 +2,9 @@
> +++ include/CMakeLists.txt
> @@ -69,10 +69,12 @@ SET(HEADERS 
>  )
>- 
>+
>++IF(FALSE) 
>  INSTALL(FILES ../libbinlogevents/export/binary_log_types.h DESTINATION ${INSTALL_INCLUDEDIR})
>-+IF(FALSE)
>  INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development)
>  INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR}/mysql COMPONENT Development 
>   PATTERN "*.h"
>Index: mysql57-server/pkg-message
>===================================================================
>--- mysql57-server/pkg-message	(.../ports-dev/databases)	(working copy)
>+++ mysql57-server/pkg-message	(.../ports-dev-copy/databases)	(working copy)
>@@ -1,6 +1,13 @@
>-************************************************************************
>+*****************************************************************************
> 
> Remember to run mysql_upgrade the first time you start the MySQL server
> after an upgrade from an earlier version.
> 
>-************************************************************************
>+Init. password for first time use of MySQL is saved in $HOME/.mysql_secret
>+ie. when you want to use "mysql -u root -p" first you should see password
>+in /root/.mysql_secret
>+
>+performance_schema feature is set off by default, because of using high RAM.
>+if you need it enable it yourself :)
>+
>+*****************************************************************************
>Index: mysql57-server/pkg-plist
>===================================================================
>--- mysql57-server/pkg-plist	(.../ports-dev/databases)	(working copy)
>+++ mysql57-server/pkg-plist	(.../ports-dev-copy/databases)	(working copy)
>@@ -19,7 +19,6 @@
> bin/resolve_stack_dump
> bin/resolveip
> bin/zlib_decompress
>-include/mysql/binary_log_types.h
> lib/mysql/libmysqld.a
> lib/mysql/plugin/adt_null.so
> lib/mysql/plugin/auth.so

Flags:

mmokhi: maintainer-approval+

Actions: View | Diff

Attachments on bug 205956: 165157 | 165159 | 165161 | 165305 | 166454 | 166493 | 166494