Fix mysqli build when building against libmysqlclient.

diff --git a/NEWS b/NEWS
index 9b4f4e9781714fd9c30cb3074e9b933733f3f9ca..55d6cbbfc5c0fcecd370b2a9bfe5bb842730d703 100644 (file)
--- 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 00cbcf204cd9d6970246cd096f5a195ae30235fc..de5cd567bbd112cd5529e9b2c30826db9e1dae7b 100644 (file)
--- 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) {