- Fixed bug #49122 (undefined reference to mysqlnd_stmt_next_result on compile with...

diff --git a/NEWS b/NEWS
index 313d84621f8b8a2ec270b1a2a3c8ac295a0edb3c..b95a9aa0a855de95d04f25f982d04486ddc581b6 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,8 @@ PHP                                                                        NEWS
 - Fixed bug #49132 (posix_times returns false without error).
   (phpbugs at gunnu dot us)
 - Fixed bug #49125 (Error in dba_exists C code). (jdornan at stanford dot edu)
+- Fixed bug #49122 (undefined reference to mysqlnd_stmt_next_result on compile with
+  --with-mysqli and MySQL 6.0). (Jani)
 - Fixed bug #49092 (ReflectionFunction fails to work with functions in fully
   qualified namespaces). (Kalle, Jani)
 - Fixed bug #49074 (private class static fields can be modified by using

diff --git a/ext/mysqli/config.m4 b/ext/mysqli/config.m4
index c69b16a81922a6386a841d8d8452ce8400e5f3e9..2c1cf78eccad26375c9ebdf31f6565b5f540b4e6 100644 (file)
--- a/ext/mysqli/config.m4
+++ b/ext/mysqli/config.m4
@@ -62,7 +62,7 @@ elif test "$PHP_MYSQLI" != "no"; then
     $MYSQLI_LIBLINE
   ])
   dnl
-  dnl Check the library for mysql_stmt_store_result
+  dnl Check the library for mysql_stmt_next_result
   dnl
   PHP_CHECK_LIBRARY($MYSQL_LIB_NAME, mysql_stmt_next_result,
   [

diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c
index 66607a5f11d182281a100aacd3cb392d63c8e184..05ad91be0f82162a925dda70a745742793a3c9ab 100644 (file)
--- a/ext/mysqli/mysqli_api.c
+++ b/ext/mysqli/mysqli_api.c
@@ -1497,7 +1497,7 @@ PHP_FUNCTION(mysqli_stmt_more_results)
        }
        MYSQLI_FETCH_RESOURCE(stmt, MY_STMT *, &mysql_stmt, "mysqli_stmt", MYSQLI_STATUS_VALID);
 
-       RETURN_BOOL(mysqlnd_stmt_more_results(stmt->stmt));
+       RETURN_BOOL(mysql_stmt_more_results(stmt->stmt));
 }
 /* }}} */
 
@@ -1513,13 +1513,13 @@ PHP_FUNCTION(mysqli_stmt_next_result) {
        }
        MYSQLI_FETCH_RESOURCE(stmt, MY_STMT *, &mysql_stmt, "mysqli_stmt", MYSQLI_STATUS_VALID);
 
-       if (!mysqlnd_stmt_more_results(stmt->stmt)) {
+       if (!mysql_stmt_more_results(stmt->stmt)) {
                php_error_docref(NULL TSRMLS_CC, E_STRICT, "There is no next result set. "
                                                "Please, call mysqli_stmt_more_results()/mysqli_stmt::more_results() to check "
                                                "whether to call this function/method");
        }
 
-       RETURN_BOOL(!mysqlnd_stmt_next_result(stmt->stmt));
+       RETURN_BOOL(!mysql_stmt_next_result(stmt->stmt));
 }
 /* }}} */
 #endif