Attachment 211093 Details for Bug 243643 – Allow system mysql

[patch] Allow system mysql

php-mysqli.diff (text/plain), 4.99 KB, created by Dima Panov on 2020-01-27 03:54:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dima Panov

Created: 2020-01-27 03:54:30 UTC

Size: 4.99 KB

patch

obsolete

>Index: php72-mysqli/files/patch-mysqli__api.c
>===================================================================
>--- php72-mysqli/files/patch-mysqli__api.c	(nonexistent)
>+++ php72-mysqli/files/patch-mysqli__api.c	(working copy)
>@@ -0,0 +1,13 @@
>+--- mysqli_api.c.orig	2020-01-07 10:40:30 UTC
>++++ mysqli_api.c
>+@@ -33,8 +33,9 @@
>+ #include "zend_smart_str.h"
>+ #include "php_mysqli_structs.h"
>+ #include "mysqli_priv.h"
>++#if defined(MYSQLI_USE_MYSQLND)
>+ #include "ext/mysqlnd/mysql_float_to_double.h"
>+-
>++#endif
>+ 
>+ #if !defined(MYSQLI_USE_MYSQLND)
>+ /* {{{ mysqli_tx_cor_options_to_string */
>
>Property changes on: php72-mysqli/files/patch-mysqli__api.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
>Index: php72-mysqli/files/patch-php_mysqli_structs.h
>===================================================================
>--- php72-mysqli/files/patch-php_mysqli_structs.h	(revision 522546)
>+++ php72-mysqli/files/patch-php_mysqli_structs.h	(working copy)
>@@ -1,5 +1,14 @@
> --- php_mysqli_structs.h.orig	2010-07-26 15:52:54.000000000 +0200
> +++ php_mysqli_structs.h	2010-07-26 15:53:14.000000000 +0200
>+@@ -38,7 +38,7 @@
>+ #define FALSE 0
>+ #endif
>+ 
>+-#ifdef MYSQLI_USE_MYSQLND
>++#if defined(MYSQLI_USE_MYSQLND)
>+ #include "ext/mysqlnd/mysqlnd.h"
>+ #include "mysqli_mysqlnd.h"
>+ #else
> @@ -54,6 +54,7 @@
>  #define WE_HAD_MBSTATE_T
>  #endif
>Index: php73-mysqli/files/patch-mysqli__api.c
>===================================================================
>--- php73-mysqli/files/patch-mysqli__api.c	(nonexistent)
>+++ php73-mysqli/files/patch-mysqli__api.c	(working copy)
>@@ -0,0 +1,13 @@
>+--- mysqli_api.c.orig	2019-12-17 10:29:23 UTC
>++++ mysqli_api.c
>+@@ -31,8 +31,9 @@
>+ #include "zend_smart_str.h"
>+ #include "php_mysqli_structs.h"
>+ #include "mysqli_priv.h"
>++#if defined(MYSQLI_USE_MYSQLND)
>+ #include "ext/mysqlnd/mysql_float_to_double.h"
>+-
>++#endif
>+ 
>+ #if !defined(MYSQLI_USE_MYSQLND)
>+ /* {{{ mysqli_tx_cor_options_to_string */
>
>Property changes on: php73-mysqli/files/patch-mysqli__api.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
>Index: php73-mysqli/files/patch-php_mysqli_structs.h
>===================================================================
>--- php73-mysqli/files/patch-php_mysqli_structs.h	(revision 522546)
>+++ php73-mysqli/files/patch-php_mysqli_structs.h	(working copy)
>@@ -1,5 +1,14 @@
>---- php_mysqli_structs.h.orig	2010-07-26 15:52:54.000000000 +0200
>-+++ php_mysqli_structs.h	2010-07-26 15:53:14.000000000 +0200
>+--- php_mysqli_structs.h.orig	2019-12-17 10:29:23 UTC
>++++ php_mysqli_structs.h
>+@@ -36,7 +36,7 @@
>+ #define FALSE 0
>+ #endif
>+ 
>+-#ifdef MYSQLI_USE_MYSQLND
>++#if defined(MYSQLI_USE_MYSQLND)
>+ #include "ext/mysqlnd/mysqlnd.h"
>+ #include "mysqli_mysqlnd.h"
>+ #else
> @@ -54,6 +54,7 @@
>  #define WE_HAD_MBSTATE_T
>  #endif
>Index: php74-mysqli/files/patch-mysqli__api.c
>===================================================================
>--- php74-mysqli/files/patch-mysqli__api.c	(nonexistent)
>+++ php74-mysqli/files/patch-mysqli__api.c	(working copy)
>@@ -0,0 +1,13 @@
>+--- mysqli_api.c.orig	2019-12-17 10:29:23 UTC
>++++ mysqli_api.c
>+@@ -31,8 +31,9 @@
>+ #include "zend_smart_str.h"
>+ #include "php_mysqli_structs.h"
>+ #include "mysqli_priv.h"
>++#if defined(MYSQLI_USE_MYSQLND)
>+ #include "ext/mysqlnd/mysql_float_to_double.h"
>+-
>++#endif
>+ 
>+ #if !defined(MYSQLI_USE_MYSQLND)
>+ /* {{{ mysqli_tx_cor_options_to_string */
>
>Property changes on: php74-mysqli/files/patch-mysqli__api.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
>Index: php74-mysqli/files/patch-php_mysqli_structs.h
>===================================================================
>--- php74-mysqli/files/patch-php_mysqli_structs.h	(revision 522546)
>+++ php74-mysqli/files/patch-php_mysqli_structs.h	(working copy)
>@@ -1,10 +1,20 @@
> --- php_mysqli_structs.h.orig	2010-07-26 15:52:54.000000000 +0200
> +++ php_mysqli_structs.h	2010-07-26 15:53:14.000000000 +0200
>-@@ -54,6 +54,7 @@
>+@@ -36,7 +36,7 @@
>+ #define FALSE 0
>+ #endif
>+ 
>+-#ifdef MYSQLI_USE_MYSQLND
>++#if defined(MYSQLI_USE_MYSQLND)
>+ #include "ext/mysqlnd/mysqlnd.h"
>+ #include "mysqli_mysqlnd.h"
>+ #else
>+@@ -53,6 +53,8 @@
>+ #undef HAVE_MBSTATE_T
>  #define WE_HAD_MBSTATE_T
>  #endif
>++
>++typedef zend_ulong ulong;
>  
>-+#define HAVE_ULONG 1
>- #include <my_global.h>
>- 
>- #if !defined(HAVE_MBRLEN) && defined(WE_HAD_MBRLEN)
>+ #if defined(ulong) && !defined(HAVE_ULONG)
>+ #define HAVE_ULONG

Flags:

tz: maintainer-approval+

Actions: View | Diff

Attachments on bug 243643: 211093