Attachment 150404 Details for Bug 195761 – patch to upgrade mariadb100-server to 10.0.15

[patch] patch to upgrade mariadb100-server to 10.0.15

patch-MariaDB-10.0.15-server (text/plain), 7.24 KB, created by Bernard Spil on 2014-12-09 17:54:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bernard Spil

Created: 2014-12-09 17:54:08 UTC

Size: 7.24 KB

patch

obsolete

>diff -ruN mariadb100-server.orig/Makefile mariadb100-server/Makefile
>--- mariadb100-server.orig/Makefile	2014-11-04 09:21:55.000000000 +0100
>+++ mariadb100-server/Makefile	2014-12-09 18:25:51.089173085 +0100
>@@ -1,7 +1,7 @@
> # $FreeBSD: head/databases/mariadb100-server/Makefile 372136 2014-11-04 08:21:55Z marino $
> 
> PORTNAME?=	mariadb
>-PORTVERSION=	10.0.14
>+PORTVERSION=	10.0.15
> CATEGORIES=	databases ipv6
> MASTER_SITES=	http://ftp.osuosl.org/pub/${SITESDIR}/ \
> 		http://mirrors.supportex.net/${SITESDIR}/ \
>@@ -26,7 +26,7 @@
> 
> BROKEN_arm=	Does not compile on arm
> 
>-OPTIONS_DEFINE=		SSL OPENSSL PORTSSL FASTMTX
>+OPTIONS_DEFINE=		INNODB SSL OPENSSL PORTSSL FASTMTX
> OPTIONS_DEFAULT=	SSL
> NO_OPTIONS_SORT=	yes
> 
>@@ -64,10 +64,12 @@
> # MySQL-Server options
> .if !defined(CLIENT_ONLY)
> USE_MYSQL=		yes
>-OPTIONS_DEFINE+=	OQGRAPH MAXKEY
>+OPTIONS_DEFINE+=	INNODB MROONGA OQGRAPH MAXKEY
> OPTIONS_DEFAULT+=	MAXKEY
> 
>-OQGRAPH_DESC=		Open Query Graph Computation engine
>+INNODB_DESC=            Build InnoDB engine next to XtraDB
>+MROONGA_DESC=		Mroonga Full Text Search engine (gcc)
>+OQGRAPH_DESC=		Open Query Graph Computation engine (gcc)
> MAXKEY_DESC=		Change max key length from 1000 to 4000
> .endif
> 
>@@ -121,6 +123,22 @@
> 		-DCMAKE_SKIP_BUILD_RPATH:BOOL=YES \
> 		-DWITHOUT_EXAMPLE_STORAGE_ENGINE=1
> 
>+.  if empty(PORT_OPTIONS:MINNODB)
>+PLIST_SUB+=	INNODB="@comment "
>+.  else
>+CMAKE_ARGS+=	-DWITHOUT_INNOBASE=1
>+PLIST_SUB+=	INNODB=""
>+.  endif
>+
>+.  if empty(PORT_OPTIONS:MMROONGA)
>+CMAKE_ARGS+=    -DWITHOUT_MROONGA=1
>+PLIST_SUB+=     MROONGA="@comment "
>+.  else
>+USE_GCC?=       yes
>+CMAKE_ARGS+=    -DWITH_MROONGA_STORAGE_ENGINE=1
>+PLIST_SUB+=     MROONGA=""
>+.  endif
>+
> .  if empty(PORT_OPTIONS:MOQGRAPH)
> CMAKE_ARGS+=	-DWITHOUT_OQGRAPH=1
> PLIST_SUB+=	OQGRAPH="@comment "
>diff -ruN mariadb100-server.orig/distinfo mariadb100-server/distinfo
>--- mariadb100-server.orig/distinfo	2014-11-04 09:21:55.000000000 +0100
>+++ mariadb100-server/distinfo	2014-12-07 14:42:09.501911188 +0100
>@@ -1,2 +1,2 @@
>-SHA256 (mariadb-10.0.14.tar.gz) = ac0eca4ebb278aa304236bf6dbd5e8c9cf285431333f1379051c231c08e2e31d
>-SIZE (mariadb-10.0.14.tar.gz) = 51156364
>+SHA256 (mariadb-10.0.15.tar.gz) = 9154cb68504d469b1bac636b85e30b2b2da2586092476d6ad2f9d6bc462909d8
>+SIZE (mariadb-10.0.15.tar.gz) = 55531927
>diff -ruN mariadb100-server.orig/files/patch-storage_connect_array.cpp mariadb100-server/files/patch-storage_connect_array.cpp
>--- mariadb100-server.orig/files/patch-storage_connect_array.cpp	2014-11-04 09:21:55.000000000 +0100
>+++ mariadb100-server/files/patch-storage_connect_array.cpp	1970-01-01 01:00:00.000000000 +0100
>@@ -1,11 +0,0 @@
>---- storage/connect/array.cpp.orig	2014-09-25 00:29:47.000000000 +0200
>-+++ storage/connect/array.cpp	2014-09-27 12:00:33.000000000 +0200
>-@@ -129,7 +129,7 @@
>-         break;
>-       case TYPE_VOID:
>-         // Integer stored inside pp->Value
>--        par->AddValue(g, (int)parmp->Value);
>-+        par->AddValue(g, *(int*)parmp->Value);
>-         break;
>-       } // endswitch valtyp
>- 
>diff -ruN mariadb100-server.orig/files/patch-storage_connect_filamap.cpp mariadb100-server/files/patch-storage_connect_filamap.cpp
>--- mariadb100-server.orig/files/patch-storage_connect_filamap.cpp	2014-11-04 09:21:55.000000000 +0100
>+++ mariadb100-server/files/patch-storage_connect_filamap.cpp	1970-01-01 01:00:00.000000000 +0100
>@@ -1,20 +0,0 @@
>---- storage/connect/filamap.cpp.orig	2014-09-25 00:29:47.000000000 +0200
>-+++ storage/connect/filamap.cpp	2014-09-27 11:46:06.000000000 +0200
>-@@ -288,7 +288,7 @@
>- /***********************************************************************/
>- /*  Initialize Fpos and Mempos for indexed DELETE.                     */
>- /***********************************************************************/
>--int MAPFAM::InitDelete(PGLOBAL g, int fpos, int spos)
>-+int MAPFAM::InitDelete(PGLOBAL g, uintptr_t fpos, uintptr_t spos)
>-   {
>-   Fpos = Memory + fpos;
>-   Mempos = Memory + spos;
>-@@ -683,7 +683,7 @@
>- /***********************************************************************/
>- /*  Initialize CurBlk, CurNum, Mempos and Fpos for indexed DELETE.     */
>- /***********************************************************************/
>--int MPXFAM::InitDelete(PGLOBAL g, int fpos, int spos)
>-+int MPXFAM::InitDelete(PGLOBAL g, uintptr_t fpos, uintptr_t spos)
>-   {
>-   Fpos = Memory + Headlen + fpos * Lrecl;
>-   Mempos = Fpos + Lrecl;
>diff -ruN mariadb100-server.orig/files/patch-storage_connect_filamap.h mariadb100-server/files/patch-storage_connect_filamap.h
>--- mariadb100-server.orig/files/patch-storage_connect_filamap.h	2014-11-04 09:21:55.000000000 +0100
>+++ mariadb100-server/files/patch-storage_connect_filamap.h	1970-01-01 01:00:00.000000000 +0100
>@@ -1,27 +0,0 @@
>---- 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
>diff -ruN mariadb100-server.orig/files/pkg-message.in mariadb100-server/files/pkg-message.in
>--- mariadb100-server.orig/files/pkg-message.in	2014-11-04 09:21:55.000000000 +0100
>+++ mariadb100-server/files/pkg-message.in	2014-12-07 14:54:15.568083285 +0100
>@@ -8,4 +8,8 @@
> my.cnf. Please move existing my.cnf files from those paths to
> %%PREFIX%%/etc and %%PREFIX%%/etc/mysql.
> 
>+This port does NOT include the mytop perl script, this is included in
>+the MariaDB tarball but the most recent version can be found in the
>+databases/mytop port
>+
> ************************************************************************
>diff -ruN mariadb100-server.orig/pkg-plist mariadb100-server/pkg-plist
>--- mariadb100-server.orig/pkg-plist	2014-11-04 09:21:55.000000000 +0100
>+++ mariadb100-server/pkg-plist	2014-12-09 18:41:34.729713503 +0100
>@@ -29,7 +29,7 @@
> bin/mysqlhotcopy
> bin/mysqltest
> bin/mysqltest_embedded
>-bin/mytop
>+@comment bin/mytop
> bin/perror
> bin/replace
> bin/resolve_stack_dump
>@@ -52,7 +52,8 @@
> lib/mysql/plugin/ha_connect.so
> lib/mysql/plugin/ha_federated.so
> lib/mysql/plugin/ha_federatedx.so
>-lib/mysql/plugin/ha_innodb.so
>+%%INNODB%%lib/mysql/plugin/ha_innodb.so
>+%%MROONGA%%lib/mysql/plugin/ha_mroonga.so
> %%OQGRAPH%%lib/mysql/plugin/ha_oqgraph.so
> lib/mysql/plugin/ha_sequence.so
> lib/mysql/plugin/ha_sphinx.so
>@@ -148,6 +149,8 @@
> %%DATADIR%%/japanese/errmsg.sys
> %%DATADIR%%/korean/errmsg.sys
> %%DATADIR%%/magic
>+%%MROONGA%%%%DATADIR%%/mroonga/install.sql
>+%%MROONGA%%%%DATADIR%%/mroonga/uninstall.sql
> %%DATADIR%%/my-huge.cnf
> %%DATADIR%%/my-innodb-heavy-4G.cnf
> %%DATADIR%%/my-large.cnf

Actions: View | Diff

Attachments on bug 195761: 150286 | 150310 | 150311 | 150314 | 150315 | 150404 | 150405