Attachment 147719 Details for Bug 193539 – Patch to upgrade -server port from 10.0.13 to 10.0.14

[patch] Patch to upgrade -server port from 10.0.13 to 10.0.14

mariadb100-server_10.0.14.patch (text/plain), 6.12 KB, created by Bernard Spil on 2014-09-27 10:32:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bernard Spil

Created: 2014-09-27 10:32:24 UTC

Size: 6.12 KB

patch

obsolete

>diff -ruN mariadb100-server.orig/Makefile mariadb100-server/Makefile
>--- mariadb100-server.orig/Makefile	2014-09-27 10:12:34.000000000 +0200
>+++ mariadb100-server/Makefile	2014-09-27 11:01:34.000000000 +0200
>@@ -1,7 +1,7 @@
> # $FreeBSD: head/databases/mariadb55-server/Makefile 367285 2014-09-04 16:14:25Z robak $
> 
> PORTNAME?=	mariadb
>-PORTVERSION=	10.0.13
>+PORTVERSION=	10.0.14
> CATEGORIES=	databases ipv6
> MASTER_SITES=	http://ftp.osuosl.org/pub/mariadb/${PORTNAME}-${PORTVERSION}/source/ \
> 		http://mirrors.supportex.net/mariadb/${PORTNAME}-${PORTVERSION}/source/ \
>@@ -25,6 +25,8 @@
> SHEBANG_FILES=	scripts/*.sh
> NO_OPTIONS_SORT=yes
> 
>+#MAKE_JOBS_UNSAFE=yes
>+
> OPTIONS_DEFINE+=	SSL OPENSSL PORTSSL FASTMTX
> OPTIONS_DEFAULT+=	SSL
> 
>diff -ruN mariadb100-server.orig/distinfo mariadb100-server/distinfo
>--- mariadb100-server.orig/distinfo	2014-09-27 10:12:49.000000000 +0200
>+++ mariadb100-server/distinfo	2014-09-27 10:13:15.000000000 +0200
>@@ -1,2 +1,2 @@
>-SHA256 (mariadb-10.0.13.tar.gz) = 1a56a0ad1178e26723dfd7e77a2266a7da89552f12ea6bd5116a00bd13fa3c0d
>-SIZE (mariadb-10.0.13.tar.gz) = 51333762
>+SHA256 (mariadb-10.0.14.tar.gz) = ac0eca4ebb278aa304236bf6dbd5e8c9cf285431333f1379051c231c08e2e31d
>+SIZE (mariadb-10.0.14.tar.gz) = 51156364
>diff -ruN mariadb100-server.orig/files/patch-cmake__jemalloc.cmake mariadb100-server/files/patch-cmake__jemalloc.cmake
>--- mariadb100-server.orig/files/patch-cmake__jemalloc.cmake	2014-09-05 18:30:25.000000000 +0200
>+++ mariadb100-server/files/patch-cmake__jemalloc.cmake	2014-09-27 10:15:12.000000000 +0200
>@@ -1,14 +1,18 @@
>---- cmake/jemalloc.cmake.orig	2014-08-09 00:13:47.000000000 +0200
>-+++ cmake/jemalloc.cmake	2014-09-05 18:29:09.213386547 +0200
>-@@ -50,9 +50,9 @@
>+--- cmake/jemalloc.cmake.orig	2014-09-25 00:29:47.000000000 +0200
>++++ cmake/jemalloc.cmake	2014-09-27 10:05:48.000000000 +0200
>+@@ -24,12 +24,12 @@
>+       SET(what system)
>+     ENDIF()
>  
>- MACRO (CHECK_JEMALLOC)
>-   IF(WITH_JEMALLOC STREQUAL "system" OR WITH_JEMALLOC STREQUAL "yes")
>--    CHECK_LIBRARY_EXISTS(jemalloc malloc_stats_print "" HAVE_JEMALLOC)
>+-    CHECK_LIBRARY_EXISTS(${libname} malloc_stats_print "" HAVE_JEMALLOC)
> +    CHECK_LIBRARY_EXISTS(c malloc_stats_print "" HAVE_JEMALLOC)
>+     SET(CMAKE_REQUIRED_LIBRARIES)
>+ 
>      IF (HAVE_JEMALLOC)
>--      SET(LIBJEMALLOC jemalloc)
>+-      SET(LIBJEMALLOC ${libname})
>+-      SET(MALLOC_LIBRARY "${what} jemalloc")
> +      SET(LIBJEMALLOC c)
>-       SET(MALLOC_LIBRARY "system jemalloc")
>-     ELSEIF (WITH_JEMALLOC STREQUAL "system")
>-       MESSAGE(FATAL_ERROR "system jemalloc is not found")
>++      SET(MALLOC_LIBRARY "system jemalloc")
>+     ELSEIF (NOT WITH_JEMALLOC STREQUAL "auto")
>+       MESSAGE(FATAL_ERROR "${libname} is not found")
>+     ENDIF()
>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	1970-01-01 01:00:00.000000000 +0100
>+++ mariadb100-server/files/patch-storage_connect_array.cpp	2014-09-27 12:01:35.000000000 +0200
>@@ -0,0 +1,11 @@
>+--- 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	1970-01-01 01:00:00.000000000 +0100
>+++ mariadb100-server/files/patch-storage_connect_filamap.cpp	2014-09-27 11:47:53.000000000 +0200
>@@ -0,0 +1,20 @@
>+--- 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	1970-01-01 01:00:00.000000000 +0100
>+++ mariadb100-server/files/patch-storage_connect_filamap.h	2014-09-27 11:47:53.000000000 +0200
>@@ -0,0 +1,27 @@
>+--- 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

Actions: View | Diff

Attachments on bug 193539: 147194 | 147249 | 147316 | 147317 | 147518 | 147718 | 147719 | 147720 | 147721