php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-28 10:43:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix mysqli build when building against libmysqlclient.

Browse Source
This commit is contained in:
Adam Harvey
2014-05-02 14:33:52 -07:00
parent fbb0c4b800
commit 06a03bbfa6
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
NEWS
+3
View File
@@ -70,6 +70,9 @@ PHP NEWS
. Fixed bug #63228 (-Werror=format-security error in lsapi code).
(Elan Ruusamäe, George)
- mysqli:
. Fixed building against an external libmysqlclient. (Adam)
- mysqlnd:
. Added a new fetching mode to mysqlnd. (Andrey)
ext/mysqli/mysqli_nonapi.c
+8
View File
@@ -575,7 +575,11 @@ PHP_FUNCTION(mysqli_query)
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty query");
RETURN_FALSE;
}
#ifdef MYSQLI_USE_MYSQLND
if ((resultmode & ~MYSQLI_ASYNC) != MYSQLI_USE_RESULT && (resultmode & ~(MYSQLI_ASYNC | MYSQLI_STORE_RESULT_COPY_DATA)) != MYSQLI_STORE_RESULT) {
#else
if ((resultmode & ~MYSQLI_ASYNC) != MYSQLI_USE_RESULT && (resultmode & ~MYSQLI_ASYNC) != MYSQLI_STORE_RESULT) {
#endif
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid value for resultmode");
RETURN_FALSE;
}
@@ -609,7 +613,11 @@ PHP_FUNCTION(mysqli_query)
RETURN_TRUE;
}
#ifdef MYSQLI_USE_MYSQLND
switch (resultmode & ~(MYSQLI_ASYNC | MYSQLI_STORE_RESULT_COPY_DATA)) {
#else
switch (resultmode & ~MYSQLI_ASYNC) {
#endif
case MYSQLI_STORE_RESULT:
#ifdef MYSQLI_USE_MYSQLND
if (resultmode & MYSQLI_STORE_RESULT_COPY_DATA) {