Fix build against 5.5.0-m2 . Does not need upmerging because

this functionality doesn't exist in PHP 5.3+

diff --git a/NEWS b/NEWS
index 750cbb2a432daed650172ee64eaea493e59ce629..72d4b026398a4eb353953bc7452124a76b57fac4 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 2010, PHP 5.2.13
+- Fixed build of mysqli with MySQL 5.5.0-m2. (Andrey)
 
 17 Dec 2009, PHP 5.2.12
 - Updated timezone database to version 2009.19 (2009s). (Derick)

diff --git a/ext/mysqli/php_mysqli.h b/ext/mysqli/php_mysqli.h
index d874703190615e501e77d41656a31e13375cb26e..e0e1554f3caa439f08f834f771fb80de2599fd54 100644 (file)
--- a/ext/mysqli/php_mysqli.h
+++ b/ext/mysqli/php_mysqli.h
@@ -302,7 +302,7 @@ if ((MyG(report_mode) & MYSQLI_REPORT_ERROR) && stmt->last_errno) { \
        php_mysqli_report_error(stmt->sqlstate, stmt->last_errno, stmt->last_error TSRMLS_CC); \
 }
 
-#if MYSQL_VERSION_ID > 32300 && MYSQL_VERSION_ID < 60000
+#if MYSQL_VERSION_ID > 32300 && MYSQL_VERSION_ID < 50500
 #define HAVE_LIBMYSQL_REPLICATION
 #endif