From: Jani Taskinen <jani@php.net>
Date: Sun, 2 Aug 2009 01:07:38 +0000 (+0000)
Subject: - Fixed bug #49122 (undefined reference to mysqlnd_stmt_next_result on compile with... 
X-Git-Tag: php-5.3.1RC1~205
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7b411d7cdf40530c036448d252d57b2ed6b07833;p=php

- Fixed bug #49122 (undefined reference to mysqlnd_stmt_next_result on compile with  --with-mysqli and MySQL 6.0)
---

diff --git a/NEWS b/NEWS
index 313d84621f..b95a9aa0a8 100644
--- 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 c69b16a819..2c1cf78ecc 100644
--- 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 66607a5f11..05ad91be0f 100644
--- 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