andrey                                   Wed, 30 Sep 2009 22:26:19 +0000

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

Log:
Fix trace output. DBG_RETURN should be used in traced
functions.

Changed paths:
    U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c
    U   php/php-src/trunk/ext/mysqlnd/mysqlnd_result.c

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c   2009-09-30 
21:58:19 UTC (rev 289026)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c   2009-09-30 
22:26:19 UTC (rev 289027)
@@ -1882,9 +1882,9 @@

        if (result->m.fetch_row) {
                if (result->m.fetch_row == result->m.fetch_row_normal_buffered) 
{
-                       return mysqlnd_fetch_row_buffered_c(result TSRMLS_CC);
+                       DBG_RETURN(mysqlnd_fetch_row_buffered_c(result 
TSRMLS_CC));
                } else if (result->m.fetch_row == 
result->m.fetch_row_normal_unbuffered) {
-                       return mysqlnd_fetch_row_unbuffered_c(result TSRMLS_CC);
+                       DBG_RETURN(mysqlnd_fetch_row_unbuffered_c(result 
TSRMLS_CC));
                } else {
                        *((int*)NULL) = 1;
                }

Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_result.c
===================================================================
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_result.c      2009-09-30 21:58:19 UTC 
(rev 289026)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_result.c      2009-09-30 22:26:19 UTC 
(rev 289027)
@@ -1882,9 +1882,9 @@

        if (result->m.fetch_row) {
                if (result->m.fetch_row == result->m.fetch_row_normal_buffered) 
{
-                       return mysqlnd_fetch_row_buffered_c(result TSRMLS_CC);
+                       DBG_RETURN(mysqlnd_fetch_row_buffered_c(result 
TSRMLS_CC));
                } else if (result->m.fetch_row == 
result->m.fetch_row_normal_unbuffered) {
-                       return mysqlnd_fetch_row_unbuffered_c(result TSRMLS_CC);
+                       DBG_RETURN(mysqlnd_fetch_row_unbuffered_c(result 
TSRMLS_CC));
                } else {
                        *((int*)NULL) = 1;
                }

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

Reply via email to