Attachment #191564 for bug #216870

Lines 1-3 Link Here

(-)xtrabackup/distinfo (-3 / +5 lines)
1	TIMESTAMP = 1482861814	1	TIMESTAMP = 1521236900
2	SHA256 (percona-xtrabackup-2.3.6.tar.gz) = 9d2dfa4ad61dd9ef8a3c292f0c15d7504c4c0de7e141a69fc5afde9d4666aec7	2	SHA256 (percona-xtrabackup-2.4.9.tar.gz) = 23c1e42ad4161b38edef126cf600e28779788a4d1736cadbb8e8f3dc219135a7
3	SIZE (percona-xtrabackup-2.3.6.tar.gz) = 34916730	3	SIZE (percona-xtrabackup-2.4.9.tar.gz) = 58001052
		4	SHA256 (boost_1_59_0.tar.bz2) = 727a932322d94287b62abb1bd2d41723eec4356a7728909e38adb65ca25241ca
		5	SIZE (boost_1_59_0.tar.bz2) = 70389425




--- cmake/install_layout.cmake	2017-02-06 18:02:22.189764000 +0000
+++ cmake/install_layout.cmake	2017-02-06 18:02:29.642407000 +0000
@@ -162,7 +162,7 @@
 #
 SET(INSTALL_SHAREDIR_STANDALONE         "share")
 SET(INSTALL_MYSQLSHAREDIR_STANDALONE    "share")
-SET(INSTALL_MYSQLTESTDIR_STANDALONE     "xtrabackup-test")
+#SET(INSTALL_MYSQLTESTDIR_STANDALONE     "xtrabackup-test")
 SET(INSTALL_SQLBENCHDIR_STANDALONE      ".")
 SET(INSTALL_SUPPORTFILESDIR_STANDALONE  "support-files")
 #
 SET(INSTALL_MYSQLDATADIR_STANDALONE     "data")




--- storage/innobase/xtrabackup/src/libarchive/CMakeLists.txt	2015-10-16 20:40:52.000000000 +0200
+++ storage/innobase/xtrabackup/src/libarchive/CMakeLists.txt.new	2015-11-03 14:46:57.952677630 +0100
@@ -822,9 +822,9 @@
 # Especially for early development, we want to be a little
 # aggressive about diagnosing build problems; this can get
 # relaxed somewhat in final shipping versions.
-IF ("CMAKE_C_COMPILER_ID" MATCHES "^GNU$")
+IF (CMAKE_C_COMPILER_ID MATCHES "^GNU$")
   ADD_DEFINITIONS(-Wall -Werror)
-ENDIF ("CMAKE_C_COMPILER_ID" MATCHES "^GNU$")
+ENDIF (CMAKE_C_COMPILER_ID MATCHES "^GNU$")
 
 IF(ENABLE_TEST)
 ADD_CUSTOM_TARGET(run_all_tests)

Line 0 Link Here

(-)xtrabackup/files/patch-sql-json_dom.h (+11 lines)
	1	--- sql/json_dom.h.orig 2018-03-17 00:21:21.146040000 +0300
	2	+++ sql/json_dom.h 2018-03-17 00:21:26.264131000 +0300
	3	@@ -368,7 +368,7 @@
	4	Json_object class.
	5	*/
	6	typedef std::map<std::string, Json_dom *, Json_key_comparator,
	7	- Malloc_allocator<std::pair<std::string, Json_dom *> > > Json_object_map;
	8	+ Malloc_allocator<std::pair<const std::string, Json_dom *> > > Json_object_map;
	9
	10	/**
	11	Represents a JSON container value of type "object" (ECMA), type

Line 0 Link Here

(-)xtrabackup/files/patch-storage-innobase-buf-buf0buf.cc (+11 lines)
	1	--- storage/innobase/buf/buf0buf.cc.orig 2018-03-17 00:16:39.121076000 +0300
	2	+++ storage/innobase/buf/buf0buf.cc 2018-03-17 00:17:08.295213000 +0300
	3	@@ -340,7 +340,7 @@
	4	const byte*,
	5	buf_chunk_t*,
	6	std::less<const byte*>,
	7	- ut_allocator<std::pair<const byte, buf_chunk_t> > >
	8	+ ut_allocator<std::pair<const byte* const, buf_chunk_t*> > >
	9	buf_pool_chunk_map_t;
	10
	11	static buf_pool_chunk_map_t* buf_chunk_map_reg;

Line 0 Link Here

(-)xtrabackup/files/patch-storage-innobase-dict-dict0stats.cc (+11 lines)
	1	--- storage/innobase/dict/dict0stats.cc.orig 2018-03-17 00:37:34.099255000 +0300
	2	+++ storage/innobase/dict/dict0stats.cc 2018-03-17 00:37:59.009449000 +0300
	3	@@ -139,7 +139,7 @@
	4	typedef std::vector<ib_uint64_t, ut_allocator<ib_uint64_t> > boundaries_t;
	5
	6	/** Allocator type used for index_map_t. */
	7	-typedef ut_allocator<std::pair<const char, dict_index_t> >
	8	+typedef ut_allocator<std::pair<const char* const, dict_index_t*> >
	9	index_map_t_allocator;
	10
	11	/** Auxiliary map used for sorting indexes by name in dict_stats_save(). */




--- storage/innobase/sync/sync0debug.cc.orig	2018-03-17 00:25:16.778406000 +0300
+++ storage/innobase/sync/sync0debug.cc	2018-03-17 00:27:34.072173000 +0300
@@ -129,7 +129,7 @@
 		os_thread_id_t,
 		Latches*,
 		os_thread_id_less,
-		ut_allocator<std::pair<const std::string, latch_meta_t> > >
+		ut_allocator<std::pair<const os_thread_id_t, Latches*> > >
 		ThreadMap;
 
 	/** Constructor */
@@ -424,7 +424,7 @@
 		latch_level_t,
 		std::string,
 		latch_level_less,
-		ut_allocator<std::pair<latch_level_t, std::string> > >
+		ut_allocator<std::pair<const latch_level_t, std::string> > >
 		Levels;
 
 	/** Mutex protecting the deadlock detector data structures. */
@@ -1718,7 +1718,7 @@
 		const void*,
 		File,
 		std::less<const void*>,
-		ut_allocator<std::pair<const void*, File> > >
+		ut_allocator<std::pair<const void* const, File> > >
 		Files;
 
 	typedef OSMutex	Mutex;




--- storage/myisam/mi_dynrec.c.orig	2018-03-16 23:50:04.334166000 +0300
+++ storage/myisam/mi_dynrec.c	2018-03-16 23:50:29.996533000 +0300
@@ -65,18 +65,13 @@
     DBUG_RETURN(1);
   }
   /*
-    I wonder if it is good to use MAP_NORESERVE. From the Linux man page:
-    MAP_NORESERVE
-      Do not reserve swap space for this mapping. When swap space is
-      reserved, one has the guarantee that it is possible to modify the
-      mapping. When swap space is not reserved one might get SIGSEGV
-      upon a write if no physical memory is available.
+      MAP_NORESERVE is unimplemented in FreeBSD
   */
   info->s->file_map= (uchar*)
                   my_mmap(0, (size_t) size,
                           info->s->mode==O_RDONLY ? PROT_READ :
                           PROT_READ | PROT_WRITE,
-                          MAP_SHARED | MAP_NORESERVE,
+                          MAP_SHARED,
                           info->dfile, 0L);
   if (info->s->file_map == (uchar*) MAP_FAILED)
   {

Lines 2-11 Link Here

(-)xtrabackup/Makefile (-3 / +7 lines)
2	# $FreeBSD: head/databases/xtrabackup/Makefile 458786 2018-01-11 20:34:08Z adamw $	2	# $FreeBSD: head/databases/xtrabackup/Makefile 458786 2018-01-11 20:34:08Z adamw $
3		3
4	PORTNAME= xtrabackup	4	PORTNAME= xtrabackup
5	PORTVERSION= 2.3.6	5	PORTVERSION= 2.4.9
6	CATEGORIES= databases	6	CATEGORIES= databases
7	MASTER_SITES= https://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-${PORTVERSION}/source/tarball/	7	MASTER_SITES= https://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-${PORTVERSION}/source/tarball/:xtrabackup \
8	DISTNAME= percona-${PORTNAME}-${PORTVERSION}	8	SF/boost/boost/1.59.0/:boost
		9	WRKSRC= ${WRKDIR}/percona-${PORTNAME}-${PORTVERSION}
		10
		11	DISTFILES= percona-${PORTNAME}-${PORTVERSION}.tar.gz:xtrabackup boost_1_59_0.tar.bz2:boost
9		12
10	MAINTAINER= aleks@twindb.com	13	MAINTAINER= aleks@twindb.com
11	COMMENT= OpenSource version of InnoDB backup with support of Percona extensions	14	COMMENT= OpenSource version of InnoDB backup with support of Percona extensions
Lines 33-38 Link Here
33	USES= alias autoreconf:build cpe gettext cmake:noninja libtool perl5 shebangfix	36	USES= alias autoreconf:build cpe gettext cmake:noninja libtool perl5 shebangfix
34	CPE_VENDOR= percona	37	CPE_VENDOR= percona
35	SHEBANG_FILES= storage/innobase/xtrabackup/xbcloud_osenv.sh	38	SHEBANG_FILES= storage/innobase/xtrabackup/xbcloud_osenv.sh
		39	CMAKE_ARGS+= -DWITH_BOOST=${WRKDIR}/boost_1_59_0
36		40
37	PLIST_FILES= bin/xtrabackup bin/xbstream bin/innobackupex bin/xbcrypt \	41	PLIST_FILES= bin/xtrabackup bin/xbstream bin/innobackupex bin/xbcrypt \
38	bin/xbcloud bin/xbcloud_osenv	42	bin/xbcloud bin/xbcloud_osenv

Return to bug 216870

Lines 1-11 Link Here

(-)xtrabackup/files/patch-cmake-install_layout.cmake (-5 / +5 lines)
1	--- cmake/install_layout.cmake.orig 2014-11-19 12:37:46.000000000 +0100	1	--- cmake/install_layout.cmake 2017-02-06 18:02:22.189764000 +0000
2	+++ cmake/install_layout.cmake 2014-11-19 12:38:08.000000000 +0100	2	+++ cmake/install_layout.cmake 2017-02-06 18:02:29.642407000 +0000
3	@@ -114,7 +114,7 @@	3	@@ -162,7 +162,7 @@
4	#	4	#
5	SET(INSTALL_SHAREDIR_STANDALONE "share")	5	SET(INSTALL_SHAREDIR_STANDALONE "share")
6	SET(INSTALL_MYSQLSHAREDIR_STANDALONE "share")	6	SET(INSTALL_MYSQLSHAREDIR_STANDALONE "share")
7	-SET(INSTALL_MYSQLTESTDIR_STANDALONE "xtrabackup-test")	7	-SET(INSTALL_MYSQLTESTDIR_STANDALONE "xtrabackup-test")
8	+# SET(INSTALL_MYSQLTESTDIR_STANDALONE "xtrabackup-test")	8	+#SET(INSTALL_MYSQLTESTDIR_STANDALONE "xtrabackup-test")
9	SET(INSTALL_SQLBENCHDIR_STANDALONE ".")
10	SET(INSTALL_SUPPORTFILESDIR_STANDALONE "support-files")	9	SET(INSTALL_SUPPORTFILESDIR_STANDALONE "support-files")
11	#	10	#
		11	SET(INSTALL_MYSQLDATADIR_STANDALONE "data")

Lines 1-14 Link Here

(-)xtrabackup/files/patch-libarchive-CMakeLists.txt (-14 lines)
1	--- storage/innobase/xtrabackup/src/libarchive/CMakeLists.txt 2015-10-16 20:40:52.000000000 +0200
2	+++ storage/innobase/xtrabackup/src/libarchive/CMakeLists.txt.new 2015-11-03 14:46:57.952677630 +0100
3	@@ -822,9 +822,9 @@
4	# Especially for early development, we want to be a little
5	# aggressive about diagnosing build problems; this can get
6	# relaxed somewhat in final shipping versions.
7	-IF ("CMAKE_C_COMPILER_ID" MATCHES "^GNU$")
8	+IF (CMAKE_C_COMPILER_ID MATCHES "^GNU$")
9	ADD_DEFINITIONS(-Wall -Werror)
10	-ENDIF ("CMAKE_C_COMPILER_ID" MATCHES "^GNU$")
11	+ENDIF (CMAKE_C_COMPILER_ID MATCHES "^GNU$")
12
13	IF(ENABLE_TEST)
14	ADD_CUSTOM_TARGET(run_all_tests)

Line 0 Link Here

(-)xtrabackup/files/patch-storage-innobase-sync-sync0debug.cc (+29 lines)
	1	--- storage/innobase/sync/sync0debug.cc.orig 2018-03-17 00:25:16.778406000 +0300
	2	+++ storage/innobase/sync/sync0debug.cc 2018-03-17 00:27:34.072173000 +0300
	3	@@ -129,7 +129,7 @@
	4	os_thread_id_t,
	5	Latches*,
	6	os_thread_id_less,
	7	- ut_allocator<std::pair<const std::string, latch_meta_t> > >
	8	+ ut_allocator<std::pair<const os_thread_id_t, Latches*> > >
	9	ThreadMap;
	10
	11	/** Constructor */
	12	@@ -424,7 +424,7 @@
	13	latch_level_t,
	14	std::string,
	15	latch_level_less,
	16	- ut_allocator<std::pair<latch_level_t, std::string> > >
	17	+ ut_allocator<std::pair<const latch_level_t, std::string> > >
	18	Levels;
	19
	20	/** Mutex protecting the deadlock detector data structures. */
	21	@@ -1718,7 +1718,7 @@
	22	const void*,
	23	File,
	24	std::less<const void*>,
	25	- ut_allocator<std::pair<const void*, File> > >
	26	+ ut_allocator<std::pair<const void* const, File> > >
	27	Files;
	28
	29	typedef OSMutex Mutex;

Line 0 Link Here

(-)xtrabackup/files/patch-storage-myisam-mi_dynrec.c (+23 lines)
	1	--- storage/myisam/mi_dynrec.c.orig 2018-03-16 23:50:04.334166000 +0300
	2	+++ storage/myisam/mi_dynrec.c 2018-03-16 23:50:29.996533000 +0300
	3	@@ -65,18 +65,13 @@
	4	DBUG_RETURN(1);
	5	}
	6	/*
	7	- I wonder if it is good to use MAP_NORESERVE. From the Linux man page:
	8	- MAP_NORESERVE
	9	- Do not reserve swap space for this mapping. When swap space is
	10	- reserved, one has the guarantee that it is possible to modify the
	11	- mapping. When swap space is not reserved one might get SIGSEGV
	12	- upon a write if no physical memory is available.
	13	+ MAP_NORESERVE is unimplemented in FreeBSD
	14	*/
	15	info->s->file_map= (uchar*)
	16	my_mmap(0, (size_t) size,
	17	info->s->mode==O_RDONLY ? PROT_READ :
	18	PROT_READ \| PROT_WRITE,
	19	- MAP_SHARED \| MAP_NORESERVE,
	20	+ MAP_SHARED,
	21	info->dfile, 0L);
	22	if (info->s->file_map == (uchar*) MAP_FAILED)
	23	{