diff options
| author | Adam Harvey <aharvey@php.net> | 2014-05-02 14:33:52 -0700 |
|---|---|---|
| committer | Adam Harvey <aharvey@php.net> | 2014-05-02 14:33:52 -0700 |
| commit | 06a03bbfa60bedb3f30bb2908449fc30d54f848e (patch) | |
| tree | 2e078a6c04000cdff4e8f57fe07a0aaf9d4f6e78 | |
| parent | fbb0c4b8001bb6b57164d00337725aae9291cf44 (diff) | |
| download | php-git-06a03bbfa60bedb3f30bb2908449fc30d54f848e.tar.gz | |
Fix mysqli build when building against libmysqlclient.
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | ext/mysqli/mysqli_nonapi.c | 8 |
2 files changed, 11 insertions, 0 deletions
@@ -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 00cbcf204c..de5cd567bb 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) { |