andrey                                   Thu, 17 Dec 2009 10:14:40 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=292243

Log:
Fix build against 5.5.0-m2 . Does not need upmerging because
this functionality doesn't exist in PHP 5.3+

Changed paths:
    U   php/php-src/branches/PHP_5_2/NEWS
    U   php/php-src/branches/PHP_5_2/ext/mysqli/php_mysqli.h

Modified: php/php-src/branches/PHP_5_2/NEWS
===================================================================
--- php/php-src/branches/PHP_5_2/NEWS   2009-12-17 10:09:57 UTC (rev 292242)
+++ php/php-src/branches/PHP_5_2/NEWS   2009-12-17 10:14:40 UTC (rev 292243)
@@ -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)

Modified: php/php-src/branches/PHP_5_2/ext/mysqli/php_mysqli.h
===================================================================
--- php/php-src/branches/PHP_5_2/ext/mysqli/php_mysqli.h        2009-12-17 
10:09:57 UTC (rev 292242)
+++ php/php-src/branches/PHP_5_2/ext/mysqli/php_mysqli.h        2009-12-17 
10:14:40 UTC (rev 292243)
@@ -302,7 +302,7 @@
        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


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to