svn commit: r404543 - in head/databases/mysql57-server: . files

[Martin Wilke]

Author: miwi
Date: Sun Dec 27 02:15:06 2015
New Revision: 404543
URL: https://svnweb.freebsd.org/changeset/ports/404543

Log:
  - Restore backwards compatibility
  - Bump PORTREVISION
  
  PR:	    205433

Deleted:
  head/databases/mysql57-server/files/patch-extra_CMakeLists.txt
Modified:
  head/databases/mysql57-server/Makefile
  head/databases/mysql57-server/files/mysql-server.in
  head/databases/mysql57-server/files/patch-storage_myisam_mi__dynrec.c
  head/databases/mysql57-server/pkg-plist

Modified: head/databases/mysql57-server/Makefile
==============================================================================
--- head/databases/mysql57-server/Makefile	Sun Dec 27 01:25:39 2015	(r404542)
+++ head/databases/mysql57-server/Makefile	Sun Dec 27 02:15:06 2015	(r404543)
@@ -3,6 +3,7 @@
 
 PORTNAME=	mysql
 PORTVERSION=	5.7.10
+PORTREVISION=	1
 CATEGORIES=	databases ipv6
 MASTER_SITES=	MYSQL/MySQL-5.7:MySQL SF/boost/boost/1.59.0:boost
 PKGNAMESUFFIX?=	57-server

Modified: head/databases/mysql57-server/files/mysql-server.in
==============================================================================
--- head/databases/mysql57-server/files/mysql-server.in	Sun Dec 27 01:25:39 2015	(r404542)
+++ head/databases/mysql57-server/files/mysql-server.in	Sun Dec 27 02:15:06 2015	(r404543)
@@ -46,7 +46,7 @@ procname="%%PREFIX%%/libexec/mysqld"
 start_precmd="${name}_prestart"
 start_postcmd="${name}_poststart"
 mysql_install_db="%%PREFIX%%/bin/mysql_install_db"
-mysql_install_db_args="--basedir=%%PREFIX%% --defaults-extra-file=${mysql_optfile} --datadir=${mysql_dbdir} --force"
+mysql_install_db_args="--defaults-extra-file=${mysql_optfile} --basedir=%%PREFIX%% --datadir=${mysql_dbdir} --mysqld-file=${procname}"
 
 mysql_create_auth_tables()
 {

Modified: head/databases/mysql57-server/files/patch-storage_myisam_mi__dynrec.c
==============================================================================
--- head/databases/mysql57-server/files/patch-storage_myisam_mi__dynrec.c	Sun Dec 27 01:25:39 2015	(r404542)
+++ head/databases/mysql57-server/files/patch-storage_myisam_mi__dynrec.c	Sun Dec 27 02:15:06 2015	(r404543)
@@ -1,4 +1,4 @@
---- storage/myisam/mi_dynrec.c.orig	2015-12-14 07:39:39 UTC
+--- storage/myisam/mi_dynrec.c.orig	2015-11-29 19:16:24 UTC
 +++ storage/myisam/mi_dynrec.c
 @@ -65,18 +65,13 @@ my_bool mi_dynmap_file(MI_INFO *info, my
      DBUG_RETURN(1);

Modified: head/databases/mysql57-server/pkg-plist
==============================================================================
--- head/databases/mysql57-server/pkg-plist	Sun Dec 27 01:25:39 2015	(r404542)
+++ head/databases/mysql57-server/pkg-plist	Sun Dec 27 02:15:06 2015	(r404543)
@@ -1,4 +1,6 @@
 bin/innochecksum
+bin/lz4_decompress
+bin/my_print_defaults
 bin/myisam_ftdump
 bin/myisamchk
 bin/myisamlog
@@ -12,6 +14,11 @@ bin/mysqld_multi
 bin/mysqld_safe
 bin/mysqldumpslow
 bin/mysqltest
+bin/perror
+bin/replace
+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