Attachment #139607 for bug #185889

View | Details | Raw Unified | Return to bug 185889
Collapse All | Expand All




# $FreeBSD: head/databases/percona55-server/Makefile 337107 2013-12-21 00:25:08Z flo $

PORTNAME?=	percona
DISTVERSION=	5.5.35-33.0
DISTNAME=	Percona-Server-5.5.34-rel32.0
PORTREVISION?=	0
CATEGORIES=	databases ipv6
MASTER_SITES=	http://www.percona.com/downloads/Percona-Server-5.5/${DISTNAME}/source/
MASTER_SITE_SUBDIR=	MySQL-5.5
PKGNAMESUFFIX?=	55-server
DISTNAME=	Percona-Server-5.5.35-rel33.0

MAINTAINER=	flo@FreeBSD.org
COMMENT?=	Multithreaded SQL database (server)

Lines 1-2 Link Here

(-)./distinfo (-2 / +2 lines)
1	SHA256 (Percona-Server-5.5.34-rel32.0.tar.gz) = 775931aba537dea4fcd4ff6d37f2f30ce24921c79cef17f0c9c595222f95a741	1	SHA256 (Percona-Server-5.5.35-rel33.0.tar.gz) = ffa9335fc6ee204b13c5d6ebe32709f2b5bc930665e8000db1864555a02049b8
2	SIZE (Percona-Server-5.5.34-rel32.0.tar.gz) = 22579884	2	SIZE (Percona-Server-5.5.35-rel33.0.tar.gz) = 22465700




--- libmysql/CMakeLists.txt.orig	2014-01-19 11:47:44.423382348 -0500
+++ libmysql/CMakeLists.txt	2014-01-19 12:08:16.021297429 -0500
@@ -165,7 +165,7 @@
 
 # Merge several convenience libraries into one big mysqlclient
 # and link them together into shared library.

+MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development NOINSTALL)
 
 # Visual Studio users need debug  static library for debug projects
 INSTALL_DEBUG_SYMBOLS(clientlib)
@@ -174,6 +174,7 @@
  INSTALL_DEBUG_TARGET(clientlib DESTINATION ${INSTALL_LIBDIR}/debug)
 ENDIF()
 
+IF(FALSE)
 IF(UNIX)
   MACRO(GET_VERSIONED_LIBNAME LIBNAME EXTENSION VERSION OUTNAME)
     SET(DOT_VERSION ".${VERSION}")
@@ -188,9 +189,11 @@
   ENDMACRO()
   INSTALL_SYMLINK(${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a mysqlclient ${INSTALL_LIBDIR} Development)
 ENDIF()

 IF(NOT DISABLE_SHARED)
-  MERGE_LIBRARIES(libmysql SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS} COMPONENT SharedLibraries)
+  MERGE_LIBRARIES(libmysql SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS} COMPONENT SharedLibraries NOINSTALL)
+  IF(FALSE)
   IF(UNIX)
     # libtool compatability
     IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
@@ -240,3 +243,4 @@
     ENDFOREACH()
   ENDIF()
 ENDIF()




--- storage/innobase/handler/i_s.cc.orig	2013-12-02 01:43:24.000000000 -0500
+++ storage/innobase/handler/i_s.cc	2014-01-19 12:21:24.113243651 -0500
@@ -49,17 +49,21 @@
 #include "btr0types.h"
 #include "buf0buddy.h"
 #include "buf0buf.h"
 #include "buf0lru.h"
+#include "dict0load.h"
+#include "buf0lru.h"
 #include "ibuf0ibuf.h"
 #include "dict0mem.h"
 #include "dict0types.h"
 #include "dict0boot.h"
 #include "dict0load.h"
 #include "ha_prototypes.h"
+#include "srv0srv.h"
 #include "srv0start.h"
 #include "srv0srv.h"
 #include "trx0i_s.h"
 #include "trx0rseg.h"
 #include "trx0trx.h"
+#include "trx0trx.h"
 #include "trx0undo.h"
 #include "log0online.h"

Return to bug 185889

Lines 1-13 Link Here

(-)./Makefile (-2 / +2 lines)
1	# $FreeBSD: head/databases/percona55-server/Makefile 337107 2013-12-21 00:25:08Z flo $	1	# $FreeBSD: head/databases/percona55-server/Makefile 337107 2013-12-21 00:25:08Z flo $
2		2
3	PORTNAME?= percona	3	PORTNAME?= percona
4	DISTVERSION= 5.5.34-32.0	4	DISTVERSION= 5.5.35-33.0
5	DISTNAME= Percona-Server-5.5.34-rel32.0
6	PORTREVISION?= 0	5	PORTREVISION?= 0
7	CATEGORIES= databases ipv6	6	CATEGORIES= databases ipv6
8	MASTER_SITES= http://www.percona.com/downloads/Percona-Server-5.5/${DISTNAME}/source/	7	MASTER_SITES= http://www.percona.com/downloads/Percona-Server-5.5/${DISTNAME}/source/
9	MASTER_SITE_SUBDIR= MySQL-5.5	8	MASTER_SITE_SUBDIR= MySQL-5.5
10	PKGNAMESUFFIX?= 55-server	9	PKGNAMESUFFIX?= 55-server
		10	DISTNAME= Percona-Server-5.5.35-rel33.0
11		11
12	MAINTAINER= flo@FreeBSD.org	12	MAINTAINER= flo@FreeBSD.org
13	COMMENT?= Multithreaded SQL database (server)	13	COMMENT?= Multithreaded SQL database (server)

Lines 1-6 Link Here

(-)./files/patch-libmysql_CMakeLists.txt (-8 / +9 lines)
1	--- libmysql/CMakeLists.txt.orig 2010-12-03 18:58:26.000000000 +0100	1	--- libmysql/CMakeLists.txt.orig 2014-01-19 11:47:44.423382348 -0500
2	+++ libmysql/CMakeLists.txt 2010-12-23 22:01:37.000000000 +0100	2	+++ libmysql/CMakeLists.txt 2014-01-19 12:08:16.021297429 -0500
3	@@ -153,13 +153,14 @@	3	@@ -165,7 +165,7 @@
4		4
5	# Merge several convenience libraries into one big mysqlclient	5	# Merge several convenience libraries into one big mysqlclient
6	# and link them together into shared library.	6	# and link them together into shared library.
Lines 8-22 Link Here
8	+MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development NOINSTALL)	8	+MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development NOINSTALL)
9		9
10	# Visual Studio users need debug static library for debug projects	10	# Visual Studio users need debug static library for debug projects
11	IF(MSVC)	11	INSTALL_DEBUG_SYMBOLS(clientlib)
12	INSTALL_DEBUG_TARGET(mysqlclient DESTINATION ${INSTALL_LIBDIR}/debug)	12	@@ -174,6 +174,7 @@
		13	INSTALL_DEBUG_TARGET(clientlib DESTINATION ${INSTALL_LIBDIR}/debug)
13	ENDIF()	14	ENDIF()
14		15
15	+IF(FALSE)	16	+IF(FALSE)
16	IF(UNIX)	17	IF(UNIX)
17	MACRO(GET_VERSIONED_LIBNAME LIBNAME EXTENSION VERSION OUTNAME)	18	MACRO(GET_VERSIONED_LIBNAME LIBNAME EXTENSION VERSION OUTNAME)
18	SET(DOT_VERSION ".${VERSION}")	19	SET(DOT_VERSION ".${VERSION}")
19	@@ -174,9 +175,11 @@	20	@@ -188,9 +189,11 @@
20	ENDMACRO()	21	ENDMACRO()
21	INSTALL_SYMLINK(${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a mysqlclient ${INSTALL_LIBDIR} Development)	22	INSTALL_SYMLINK(${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a mysqlclient ${INSTALL_LIBDIR} Development)
22	ENDIF()	23	ENDIF()
Lines 25-35 Link Here
25	IF(NOT DISABLE_SHARED)	26	IF(NOT DISABLE_SHARED)
26	- MERGE_LIBRARIES(libmysql SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS} COMPONENT SharedLibraries)	27	- MERGE_LIBRARIES(libmysql SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS} COMPONENT SharedLibraries)
27	+ MERGE_LIBRARIES(libmysql SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS} COMPONENT SharedLibraries NOINSTALL)	28	+ MERGE_LIBRARIES(libmysql SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS} COMPONENT SharedLibraries NOINSTALL)
28	+IF(FALSE)	29	+ IF(FALSE)
29	IF(UNIX)	30	IF(UNIX)
30	# libtool compatability	31	# libtool compatability
31	IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)	32	IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
32	@@ -223,3 +226,4 @@	33	@@ -240,3 +243,4 @@
33	ENDFOREACH()	34	ENDFOREACH()
34	ENDIF()	35	ENDIF()
35	ENDIF()	36	ENDIF()

Lines 1-20 Link Here

(-)./files/patch-storage__innobase__handler__i_s.cc (-5 / +8 lines)
1	--- storage/innobase/handler/i_s.cc.orig 2013-08-27 16:58:46.000000000 +0200	1	--- storage/innobase/handler/i_s.cc.orig 2013-12-02 01:43:24.000000000 -0500
2	+++ storage/innobase/handler/i_s.cc 2013-09-30 19:31:59.983048770 +0200	2	+++ storage/innobase/handler/i_s.cc 2014-01-19 12:21:24.113243651 -0500
3	@@ -48,14 +48,18 @@	3	@@ -49,17 +49,21 @@
4	#include "btr0types.h"
5	#include "buf0buddy.h"	4	#include "buf0buddy.h"
6	#include "buf0buf.h"	5	#include "buf0buf.h"
7	+#include "buf0lru.h"	6	#include "buf0lru.h"
8	+#include "dict0load.h"	7	+#include "dict0load.h"
		8	+#include "buf0lru.h"
9	#include "ibuf0ibuf.h"	9	#include "ibuf0ibuf.h"
10	#include "dict0mem.h"	10	#include "dict0mem.h"
11	#include "dict0types.h"	11	#include "dict0types.h"
12	#include "dict0boot.h"	12	#include "dict0boot.h"
		13	#include "dict0load.h"
13	#include "ha_prototypes.h"	14	#include "ha_prototypes.h"
14	+#include "srv0srv.h"	15	+#include "srv0srv.h"
15	#include "srv0start.h"	16	#include "srv0start.h"
		17	#include "srv0srv.h"
16	#include "trx0i_s.h"	18	#include "trx0i_s.h"
17	#include "trx0rseg.h"	19	#include "trx0rseg.h"
		20	#include "trx0trx.h"
18	+#include "trx0trx.h"	21	+#include "trx0trx.h"
19	#include "trx0undo.h"	22	#include "trx0undo.h"
20	#include "log0online.h"	23	#include "log0online.h"