Attachment 196126 Details for Bug 230538 – working patch not coflicing with other patches

[patch] working patch not coflicing with other patches

patch-mysql-1.80 (text/plain), 1.34 KB, created by Please on 2018-08-12 14:37:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Please

Created: 2018-08-12 14:37:24 UTC

Size: 1.34 KB

patch

obsolete

>--- apr-util-1.6.1/build/dbd.m4	2018-08-12 14:07:40.959196000 +0000
>+++ apr-util-1.6.1/build/dbd.m4	2018-08-12 13:56:23.271280000 +0000
>@@ -190,7 +190,7 @@
> 	AC_CHECK_HEADERS([mysql/mysql.h mysql/errmsg.h], [apu_have_mysql=1], [apu_have_mysql=0; break])
>       fi
>       if test "$apr_have_mysql" = "1"; then
>-	AC_CHECK_HEADERS([my_global.h my_sys.h mysql/my_global.h mysql/my_sys.h])
>+#	AC_CHECK_HEADERS([my_global.h my_sys.h mysql/my_global.h mysql/my_sys.h])
> 	AC_CHECK_LIB($my_library, mysql_init,, [apu_have_mysql=0])
>       fi
>       if test "$apu_have_mysql" = "1" && test "x$MYSQL_CONFIG" != 'x'; then
>@@ -225,7 +225,7 @@
> 	AC_CHECK_HEADERS([mysql/mysql.h mysql/errmsg.h], [apu_have_mysql=1], [apu_have_mysql=0; break])
>       fi
>       if test "$apr_have_mysql" = "1"; then
>-	AC_CHECK_HEADERS([my_global.h my_sys.h mysql/my_global.h mysql/my_sys.h])
>+#	AC_CHECK_HEADERS([my_global.h my_sys.h mysql/my_global.h mysql/my_sys.h])
> 	AC_CHECK_LIB($my_library, mysql_init,, [apu_have_mysql=0])
>       fi
>       if test "$apu_have_mysql" = "1"; then
>--- apr-util-1.6.1/dbd/apr_dbd_mysql.c	2018-08-12 14:07:40.959591000 +0000
>+++ apr-util-1.6.1/dbd/apr_dbd_mysql.c	2018-08-12 13:52:53.684116000 +0000
>@@ -16,6 +16,11 @@
> 
> #include "apu.h"
> 
>+#ifndef HAVE_TYPE_MY_BOOL
>+#include <stdbool.h>
>+typedef bool my_bool;
>+#endif
>+
> #if APU_HAVE_MYSQL
> 
> #include "apu_version.h"

Actions: View | Diff

Attachments on bug 230538: 196091 | 196124 | 196126 | 233047