diff options
| author | Andrey Hristov <andrey@php.net> | 2009-12-17 10:14:40 +0000 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2009-12-17 10:14:40 +0000 |
| commit | f0edab5e1b36f393a70a8c57fabf795e2717bbd7 (patch) | |
| tree | 9f0222a0dbd4aca3310a76a4208f4900299ab8bb | |
| parent | b451eee71c0fd76eaa4a8597695a7facbd59588b (diff) | |
| download | php-git-f0edab5e1b36f393a70a8c57fabf795e2717bbd7.tar.gz | |
Fix build against 5.5.0-m2 . Does not need upmerging because
this functionality doesn't exist in PHP 5.3+
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | ext/mysqli/php_mysqli.h | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -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 |