com php-src: Fix mysqli build when building against libmysqlclient.: NEWS ext/mysqli/mysqli_nonapi.c

Commit: 06a03bbfa60bedb3f30bb2908449fc30d54f848e Author: Adam Harvey <aharvey@php.net> Fri, 2 May 2014 14:33:52 -0700 Parents: fbb0c4b8001bb6b57164d00337725aae9291cf44 Branches: PHP-5.6 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=06a03bbfa60bedb3f30bb2908449fc30d54f848e Log: Fix mysqli build when building against libmysqlclient. Changed paths: M NEWS M ext/mysqli/mysqli_nonapi.c Diff: diff --git a/NEWS b/NEWS index 9b4f4e9..55d6cbb 100644 --- a/NEWS +++ b/NEWS @@ -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) diff --git a/ext/mysqli/mysqli_nonapi.c b/ext/mysqli/mysqli_nonapi.c index 00cbcf2..de5cd56 100644 --- a/ext/mysqli/mysqli_nonapi.c +++ b/ext/mysqli/mysqli_nonapi.c @@ -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) {