jani Sun, 02 Aug 2009 01:07:38 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=286640
Log: - Fixed bug #49122 (undefined reference to mysqlnd_stmt_next_result on compile with --with-mysqli and MySQL 6.0) Bug: http://bugs.php.net/49122 (Open) undefined reference to mysqlnd_stmt_next_result on compile with --with-mysqli Changed paths: U php/php-src/branches/PHP_5_3/NEWS U php/php-src/branches/PHP_5_3/ext/mysqli/config.m4 U php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_api.c U php/php-src/trunk/ext/mysqli/config.m4 U php/php-src/trunk/ext/mysqli/mysqli_api.c Modified: php/php-src/branches/PHP_5_3/NEWS =================================================================== --- php/php-src/branches/PHP_5_3/NEWS 2009-08-02 00:45:23 UTC (rev 286639) +++ php/php-src/branches/PHP_5_3/NEWS 2009-08-02 01:07:38 UTC (rev 286640) @@ -11,6 +11,8 @@ - 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 Modified: php/php-src/branches/PHP_5_3/ext/mysqli/config.m4 =================================================================== --- php/php-src/branches/PHP_5_3/ext/mysqli/config.m4 2009-08-02 00:45:23 UTC (rev 286639) +++ php/php-src/branches/PHP_5_3/ext/mysqli/config.m4 2009-08-02 01:07:38 UTC (rev 286640) @@ -62,7 +62,7 @@ $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, [ Modified: php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_api.c =================================================================== --- php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_api.c 2009-08-02 00:45:23 UTC (rev 286639) +++ php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_api.c 2009-08-02 01:07:38 UTC (rev 286640) @@ -1497,7 +1497,7 @@ } 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 @@ } 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 Modified: php/php-src/trunk/ext/mysqli/config.m4 =================================================================== --- php/php-src/trunk/ext/mysqli/config.m4 2009-08-02 00:45:23 UTC (rev 286639) +++ php/php-src/trunk/ext/mysqli/config.m4 2009-08-02 01:07:38 UTC (rev 286640) @@ -62,7 +62,7 @@ $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, [ Modified: php/php-src/trunk/ext/mysqli/mysqli_api.c =================================================================== --- php/php-src/trunk/ext/mysqli/mysqli_api.c 2009-08-02 00:45:23 UTC (rev 286639) +++ php/php-src/trunk/ext/mysqli/mysqli_api.c 2009-08-02 01:07:38 UTC (rev 286640) @@ -1550,7 +1550,7 @@ } 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)); } /* }}} */ @@ -1566,13 +1566,13 @@ } 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
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
