Attachment 196267 Details for Bug 230682 – mariadb103-client.patch

[patch] mariadb103-client.patch

mariadb103-client.patch (text/plain), 1.94 KB, created by Naram Qashat on 2018-08-17 02:07:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Naram Qashat

Created: 2018-08-17 02:07:25 UTC

Size: 1.94 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 477400)
>+++ Makefile	(working copy)
>@@ -7,8 +7,6 @@
> 
> COMMENT=	Multithreaded SQL database (client)
> 
>-BROKEN_aarch64=		fails to link: missing sbrk
>-
> MASTERDIR=	${.CURDIR}/../mariadb103-server
> 
> FILESDIR=	${.CURDIR}/files
>Index: files/patch-mysys_stacktrace.c
>===================================================================
>--- files/patch-mysys_stacktrace.c	(nonexistent)
>+++ files/patch-mysys_stacktrace.c	(working copy)
>@@ -0,0 +1,47 @@
>+--- mysys/stacktrace.c.orig	2018-07-02 07:34:11 UTC
>++++ mysys/stacktrace.c
>+@@ -34,19 +34,19 @@
>+ #include <execinfo.h>
>+ #endif
>+ 
>++#ifdef __linux__
>+ #define PTR_SANE(p) ((p) && (char*)(p) >= heap_start && (char*)(p) <= heap_end)
>+-
>+ static char *heap_start;
>+-
>+-#if(defined HAVE_BSS_START) && !(defined __linux__)
>+ extern char *__bss_start;
>+-#endif
>++#else
>++#define PTR_SANE(p) (p)
>++#endif /* __linux */
>+ 
>+ void my_init_stacktrace()
>+ {
>+-#if(defined HAVE_BSS_START) && !(defined __linux__)
>++#ifdef __linux__
>+   heap_start = (char*) &__bss_start;
>+-#endif
>++#endif /* __linux__ */
>+ }
>+ 
>+ #ifdef __linux__
>+@@ -149,15 +149,16 @@ static int safe_print_str(const char *ad
>+ 
>+ int my_safe_print_str(const char* val, size_t max_len)
>+ {
>++#ifdef __linux__
>++/* Only needed by the linux version of PTR_SANE */
>+   char *heap_end;
>+ 
>+-#ifdef __linux__
>+   // Try and make use of /proc filesystem to safely print memory contents.
>+   if (!safe_print_str(val, max_len))
>+     return 0;
>+-#endif
>+ 
>+   heap_end= (char*) sbrk(0);
>++#endif
>+ 
>+   if (!PTR_SANE(val))
>+   {
>
>Property changes on: files/patch-mysys_stacktrace.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Flags:

cyberbotx: maintainer-approval?

Actions: View | Diff

Attachments on bug 230682: 196266 | 196267