diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-05-05 13:02:43 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-05-05 13:02:43 +0400 |
| commit | cd4b4dfc4d661c0bb6f8bffc4c7d285194904e28 (patch) | |
| tree | dfcce3d9dbf2a12e10ada6edf2f66dc801cd0fc5 /ext/mysqli/mysqli_nonapi.c | |
| parent | 83d45d0a04e3cca8282911c8a384a73297f7375f (diff) | |
| parent | 149568f4da75a148d6ca71073b353f0d5f8f477a (diff) | |
| download | php-git-cd4b4dfc4d661c0bb6f8bffc4c7d285194904e28.tar.gz | |
Merge branch 'master' into refactoring2
Conflicts:
Zend/zend_hash.c
ext/date/php_date.c
Diffstat (limited to 'ext/mysqli/mysqli_nonapi.c')
| -rw-r--r-- | ext/mysqli/mysqli_nonapi.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/ext/mysqli/mysqli_nonapi.c b/ext/mysqli/mysqli_nonapi.c index 034c835b96..ff0476767a 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) { |