Sync mysqlnd. Should still compile with 5_2 for those who want to use the

current stable branch. mysqli from 5_3 patched for mysqlnd should be also
compilable with 5_2.

diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c
index c2fda21b0ec05a5f0dd10c0986836b493bd7e330..7aca23749498ee64d090477aac23286727dc7bd9 100644 (file)
--- a/ext/mysqli/mysqli.c
+++ b/ext/mysqli/mysqli.c
@@ -315,6 +315,14 @@ static int mysqli_write_na(mysqli_object *obj, zval *newval TSRMLS_DC)
 }
 /* }}} */
 
+#ifndef Z_ADDREF_P
+/* PHP 5.2, old GC */
+#define Z_ADDREF_P(pz)                         (++(pz)->refcount)
+#define Z_REFCOUNT_P(pz)                       ((pz)->refcount)
+#define Z_SET_REFCOUNT_P(pz, rc)       ((pz)->refcount = rc)
+#endif
+
+
 /* {{{ mysqli_read_property */
 zval *mysqli_read_property(zval *object, zval *member, int type TSRMLS_DC)
 {

diff --git a/ext/mysqlnd/mysqlnd_priv.h b/ext/mysqlnd/mysqlnd_priv.h
index 83bc0665cb3a1898cdb8c1a5e1ba1b1fac15f9fa..cd3f11cbb48e1c44cc43118ba00379767233c4c7 100644 (file)
--- a/ext/mysqlnd/mysqlnd_priv.h
+++ b/ext/mysqlnd/mysqlnd_priv.h
@@ -23,6 +23,16 @@
 #ifndef MYSQLND_PRIV_H
 #define MYSQLND_PRIV_H
 
+#ifndef Z_ADDREF_P
+/* PHP 5.2, old GC */
+#define Z_ADDREF_P(pz)                         (++(pz)->refcount)
+#define Z_DELREF_P(pz)                         (--(pz)->refcount)
+#define Z_REFCOUNT_P(pz)                       ((pz)->refcount)
+#define Z_SET_REFCOUNT_P(pz, rc)       ((pz)->refcount = rc)
+#define Z_REFCOUNT_PP(ppz)                     Z_REFCOUNT_P(*(ppz))
+#define Z_DELREF_PP(ppz)                       Z_DELREF_P(*(ppz))
+#endif
+
 #ifdef ZTS
 #include "TSRM.h"
 #endif