Attachment #150310 for bug #195761

Lines 1-7 Link Here

(-)mariadb100-server-10.0.15/Makefile (-2 / +5 lines)
1	# $FreeBSD: head/databases/mariadb100-server/Makefile 372136 2014-11-04 08:21:55Z marino $	1	# $FreeBSD: head/databases/mariadb100-server/Makefile 372136 2014-11-04 08:21:55Z marino $
2		2
3	PORTNAME?= mariadb	3	PORTNAME?= mariadb
4	PORTVERSION= 10.0.14	4	PORTVERSION= 10.0.15
5	CATEGORIES= databases ipv6	5	CATEGORIES= databases ipv6
6	MASTER_SITES= http://ftp.osuosl.org/pub/${SITESDIR}/ \	6	MASTER_SITES= http://ftp.osuosl.org/pub/${SITESDIR}/ \
7	http://mirrors.supportex.net/${SITESDIR}/ \	7	http://mirrors.supportex.net/${SITESDIR}/ \
Lines 119-125 Link Here
119	GROUPS= mysql	119	GROUPS= mysql
120	CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON" \	120	CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON" \
121	-DCMAKE_SKIP_BUILD_RPATH:BOOL=YES \	121	-DCMAKE_SKIP_BUILD_RPATH:BOOL=YES \
122	-DWITHOUT_EXAMPLE_STORAGE_ENGINE=1	122	-DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \
		123	-DWITHOUT_MROONGA=1
123		124
124	. if empty(PORT_OPTIONS:MOQGRAPH)	125	. if empty(PORT_OPTIONS:MOQGRAPH)
125	CMAKE_ARGS+= -DWITHOUT_OQGRAPH=1	126	CMAKE_ARGS+= -DWITHOUT_OQGRAPH=1
Lines 142-147 Link Here
142	${STAGEDIR}${PREFIX}/bin/mysql_config \	143	${STAGEDIR}${PREFIX}/bin/mysql_config \
143	${STAGEDIR}${PREFIX}/bin/mysql_find_rows \	144	${STAGEDIR}${PREFIX}/bin/mysql_find_rows \
144	${STAGEDIR}${PREFIX}/bin/mysqlaccess	145	${STAGEDIR}${PREFIX}/bin/mysqlaccess
		146	# Remove mytop, this is a separate port, see pkg-message
		147	${RM} ${STAGEDIR}${PREFIX}/bin/mytop
145	.endif	148	.endif
146		149
147	post-patch:	150	post-patch:

Lines 1-2 Link Here

(-)mariadb100-server-10.0.15/distinfo (-2 / +2 lines)
1	SHA256 (mariadb-10.0.14.tar.gz) = ac0eca4ebb278aa304236bf6dbd5e8c9cf285431333f1379051c231c08e2e31d	1	SHA256 (mariadb-10.0.15.tar.gz) = 9154cb68504d469b1bac636b85e30b2b2da2586092476d6ad2f9d6bc462909d8
2	SIZE (mariadb-10.0.14.tar.gz) = 51156364	2	SIZE (mariadb-10.0.15.tar.gz) = 55531927

Lines 1-11 Link Here

(-)mariadb100-server-10.0.15/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

Lines 1-20 Link Here

(-)mariadb100-server-10.0.15/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

Lines 8-11 Link Here

(-)mariadb100-server-10.0.15/files/pkg-message.in (+4 lines)
8	my.cnf. Please move existing my.cnf files from those paths to	8	my.cnf. Please move existing my.cnf files from those paths to
9	%%PREFIX%%/etc and %%PREFIX%%/etc/mysql.	9	%%PREFIX%%/etc and %%PREFIX%%/etc/mysql.
10		10
		11	This port does NOT include the mytop perl script, this is included in
		12	the MariaDB tarball but the most recent version can be found in the
		13	databases/mytop port
		14
11	************************************************************************	15	************************************************************************

Lines 29-35 Link Here

(-)mariadb100-server-10.0.15/pkg-plist (-1 lines)
29	bin/mysqlhotcopy	29	bin/mysqlhotcopy
30	bin/mysqltest	30	bin/mysqltest
31	bin/mysqltest_embedded	31	bin/mysqltest_embedded
32	bin/mytop
33	bin/perror	32	bin/perror
34	bin/replace	33	bin/replace
35	bin/resolve_stack_dump	34	bin/resolve_stack_dump

Return to bug 195761

Lines 1-27 Link Here

(-)mariadb100-server-10.0.15/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