jani                                     Tue, 04 Aug 2009 14:49:33 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=286807

Log:
- Revert bad fix for bug #49122 and only enable this when mysqlnd is used

Bug: http://bugs.php.net/49122 (Assigned) undefined reference to 
mysqlnd_stmt_next_result on compile with --with-mysqli
      
Changed paths:
    U   php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_api.c

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-04 
14:34:44 UTC (rev 286806)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_api.c        2009-08-04 
14:49:33 UTC (rev 286807)
@@ -1483,8 +1483,7 @@
 }
 /* }}} */

-
-#ifdef HAVE_STMT_NEXT_RESULT
+#if defined(HAVE_STMT_NEXT_RESULT) && defined(MYSQLI_USE_MYSQLND)
 /* {{{ proto bool mysqli_stmt_next_result(object link)
    check if there any more query results from a multi query */
 PHP_FUNCTION(mysqli_stmt_more_results)
@@ -1497,7 +1496,7 @@
        }
        MYSQLI_FETCH_RESOURCE(stmt, MY_STMT *, &mysql_stmt, "mysqli_stmt", 
MYSQLI_STATUS_VALID);

-       RETURN_BOOL(mysql_stmt_more_results(stmt->stmt));
+       RETURN_BOOL(mysqlnd_stmt_more_results(stmt->stmt));
 }
 /* }}} */

@@ -1513,7 +1512,7 @@
        }
        MYSQLI_FETCH_RESOURCE(stmt, MY_STMT *, &mysql_stmt, "mysqli_stmt", 
MYSQLI_STATUS_VALID);

-       if (!mysql_stmt_more_results(stmt->stmt)) {
+       if (!mysqlnd_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");

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to