From f0edab5e1b36f393a70a8c57fabf795e2717bbd7 Mon Sep 17 00:00:00 2001 From: Andrey Hristov Date: Thu, 17 Dec 2009 10:14:40 +0000 Subject: [PATCH] Fix build against 5.5.0-m2 . Does not need upmerging because this functionality doesn't exist in PHP 5.3+ --- NEWS | 1 + ext/mysqli/php_mysqli.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 750cbb2a43..72d4b02639 100644 --- 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 d874703190..e0e1554f3c 100644 --- 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 -- 2.50.1