Attachment #147719 for bug #193539

Lines 1-7 Link Here

(-)mariadb100-server/Makefile (-1 / +3 lines)
1	# $FreeBSD: head/databases/mariadb55-server/Makefile 367285 2014-09-04 16:14:25Z robak $	1	# $FreeBSD: head/databases/mariadb55-server/Makefile 367285 2014-09-04 16:14:25Z robak $
2		2
3	PORTNAME?= mariadb	3	PORTNAME?= mariadb
4	PORTVERSION= 10.0.13	4	PORTVERSION= 10.0.14
5	CATEGORIES= databases ipv6	5	CATEGORIES= databases ipv6
6	MASTER_SITES= http://ftp.osuosl.org/pub/mariadb/${PORTNAME}-${PORTVERSION}/source/ \	6	MASTER_SITES= http://ftp.osuosl.org/pub/mariadb/${PORTNAME}-${PORTVERSION}/source/ \
7	http://mirrors.supportex.net/mariadb/${PORTNAME}-${PORTVERSION}/source/ \	7	http://mirrors.supportex.net/mariadb/${PORTNAME}-${PORTVERSION}/source/ \
Lines 25-30 Link Here
25	SHEBANG_FILES= scripts/*.sh	25	SHEBANG_FILES= scripts/*.sh
26	NO_OPTIONS_SORT=yes	26	NO_OPTIONS_SORT=yes
27		27
		28	#MAKE_JOBS_UNSAFE=yes
		29
28	OPTIONS_DEFINE+= SSL OPENSSL PORTSSL FASTMTX	30	OPTIONS_DEFINE+= SSL OPENSSL PORTSSL FASTMTX
29	OPTIONS_DEFAULT+= SSL	31	OPTIONS_DEFAULT+= SSL
30		32

Lines 1-2 Link Here

(-)mariadb100-server/distinfo (-2 / +2 lines)
1	SHA256 (mariadb-10.0.13.tar.gz) = 1a56a0ad1178e26723dfd7e77a2266a7da89552f12ea6bd5116a00bd13fa3c0d	1	SHA256 (mariadb-10.0.14.tar.gz) = ac0eca4ebb278aa304236bf6dbd5e8c9cf285431333f1379051c231c08e2e31d
2	SIZE (mariadb-10.0.13.tar.gz) = 51333762	2	SIZE (mariadb-10.0.14.tar.gz) = 51156364

Lines 1-14 Link Here

(-)mariadb100-server/files/patch-cmake__jemalloc.cmake (-10 / +14 lines)
1	--- cmake/jemalloc.cmake.orig 2014-08-09 00:13:47.000000000 +0200	1	--- cmake/jemalloc.cmake.orig 2014-09-25 00:29:47.000000000 +0200
2	+++ cmake/jemalloc.cmake 2014-09-05 18:29:09.213386547 +0200	2	+++ cmake/jemalloc.cmake 2014-09-27 10:05:48.000000000 +0200
3	@@ -50,9 +50,9 @@	3	@@ -24,12 +24,12 @@
		4	SET(what system)
		5	ENDIF()
4		6
5	MACRO (CHECK_JEMALLOC)	7	- CHECK_LIBRARY_EXISTS(${libname} malloc_stats_print "" HAVE_JEMALLOC)
6	IF(WITH_JEMALLOC STREQUAL "system" OR WITH_JEMALLOC STREQUAL "yes")
7	- CHECK_LIBRARY_EXISTS(jemalloc malloc_stats_print "" HAVE_JEMALLOC)
8	+ CHECK_LIBRARY_EXISTS(c malloc_stats_print "" HAVE_JEMALLOC)	8	+ CHECK_LIBRARY_EXISTS(c malloc_stats_print "" HAVE_JEMALLOC)
		9	SET(CMAKE_REQUIRED_LIBRARIES)
		10
9	IF (HAVE_JEMALLOC)	11	IF (HAVE_JEMALLOC)
10	- SET(LIBJEMALLOC jemalloc)	12	- SET(LIBJEMALLOC ${libname})
		13	- SET(MALLOC_LIBRARY "${what} jemalloc")
11	+ SET(LIBJEMALLOC c)	14	+ SET(LIBJEMALLOC c)
12	SET(MALLOC_LIBRARY "system jemalloc")	15	+ SET(MALLOC_LIBRARY "system jemalloc")
13	ELSEIF (WITH_JEMALLOC STREQUAL "system")	16	ELSEIF (NOT WITH_JEMALLOC STREQUAL "auto")
14	MESSAGE(FATAL_ERROR "system jemalloc is not found")	17	MESSAGE(FATAL_ERROR "${libname} is not found")
		18	ENDIF()

Line 0 Link Here

(-)mariadb100-server/files/patch-storage_connect_array.cpp (+11 lines)
	1	--- storage/connect/array.cpp.orig 2014-09-25 00:29:47.000000000 +0200
	2	+++ storage/connect/array.cpp 2014-09-27 12:00:33.000000000 +0200
	3	@@ -129,7 +129,7 @@
	4	break;
	5	case TYPE_VOID:
	6	// Integer stored inside pp->Value
	7	- par->AddValue(g, (int)parmp->Value);
	8	+ par->AddValue(g, (int)parmp->Value);
	9	break;
	10	} // endswitch valtyp
	11

Line 0 Link Here

(-)mariadb100-server/files/patch-storage_connect_filamap.cpp (+20 lines)
	1	--- storage/connect/filamap.cpp.orig 2014-09-25 00:29:47.000000000 +0200
	2	+++ storage/connect/filamap.cpp 2014-09-27 11:46:06.000000000 +0200
	3	@@ -288,7 +288,7 @@
	4	/***********************************************************************/
	5	/* Initialize Fpos and Mempos for indexed DELETE. */
	6	/***********************************************************************/
	7	-int MAPFAM::InitDelete(PGLOBAL g, int fpos, int spos)
	8	+int MAPFAM::InitDelete(PGLOBAL g, uintptr_t fpos, uintptr_t spos)
	9	{
	10	Fpos = Memory + fpos;
	11	Mempos = Memory + spos;
	12	@@ -683,7 +683,7 @@
	13	/***********************************************************************/
	14	/* Initialize CurBlk, CurNum, Mempos and Fpos for indexed DELETE. */
	15	/***********************************************************************/
	16	-int MPXFAM::InitDelete(PGLOBAL g, int fpos, int spos)
	17	+int MPXFAM::InitDelete(PGLOBAL g, uintptr_t fpos, uintptr_t spos)
	18	{
	19	Fpos = Memory + Headlen + fpos * Lrecl;
	20	Mempos = Fpos + Lrecl;




--- storage/connect/filamap.h.orig	2014-09-25 00:29:47.000000000 +0200
+++ storage/connect/filamap.h	2014-09-27 11:44:39.000000000 +0200
@@ -47,7 +47,7 @@
   virtual void  Rewind(void);
 
  protected:
-  virtual int   InitDelete(PGLOBAL g, int fpos, int spos);
+  virtual int   InitDelete(PGLOBAL g, uintptr_t fpos, uintptr_t spos);
 
   // Members
   char *Memory;               // Pointer on file mapping view.
@@ -104,13 +104,13 @@
   virtual int   MaxBlkSize(PGLOBAL g, int s)
                 {return TXTFAM::MaxBlkSize(g, s);}
   virtual bool  SetPos(PGLOBAL g, int recpos);
-  virtual int   GetNextPos(void) {return (int)Fpos + Nrec;}
+  virtual int   GetNextPos(void) {return (uintptr_t)Fpos + Nrec;}
   virtual bool  DeferReading(void) {return false;}
   virtual int   ReadBuffer(PGLOBAL g);
   virtual int   WriteBuffer(PGLOBAL g);
 
  protected:
-  virtual int   InitDelete(PGLOBAL g, int fpos, int spos);
+  virtual int   InitDelete(PGLOBAL g, uintptr_t fpos, uintptr_t spos);
 
   // No additional members
   }; // end of class MPXFAM

Return to bug 193539

Line 0 Link Here

(-)mariadb100-server/files/patch-storage_connect_filamap.h (+27 lines)
	1	--- storage/connect/filamap.h.orig 2014-09-25 00:29:47.000000000 +0200
	2	+++ storage/connect/filamap.h 2014-09-27 11:44:39.000000000 +0200
	3	@@ -47,7 +47,7 @@
	4	virtual void Rewind(void);
	5
	6	protected:
	7	- virtual int InitDelete(PGLOBAL g, int fpos, int spos);
	8	+ virtual int InitDelete(PGLOBAL g, uintptr_t fpos, uintptr_t spos);
	9
	10	// Members
	11	char *Memory; // Pointer on file mapping view.
	12	@@ -104,13 +104,13 @@
	13	virtual int MaxBlkSize(PGLOBAL g, int s)
	14	{return TXTFAM::MaxBlkSize(g, s);}
	15	virtual bool SetPos(PGLOBAL g, int recpos);
	16	- virtual int GetNextPos(void) {return (int)Fpos + Nrec;}
	17	+ virtual int GetNextPos(void) {return (uintptr_t)Fpos + Nrec;}
	18	virtual bool DeferReading(void) {return false;}
	19	virtual int ReadBuffer(PGLOBAL g);
	20	virtual int WriteBuffer(PGLOBAL g);
	21
	22	protected:
	23	- virtual int InitDelete(PGLOBAL g, int fpos, int spos);
	24	+ virtual int InitDelete(PGLOBAL g, uintptr_t fpos, uintptr_t spos);
	25
	26	// No additional members
	27	}; // end of class MPXFAM