andrey                                   Thu, 16 Dec 2010 12:18:54 +0000

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

Log:
Fix sprintf modifier to be right, wrong data reported in the log

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   2010-12-16 
12:10:03 UTC (rev 306404)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c   2010-12-16 
12:18:54 UTC (rev 306405)
@@ -1270,8 +1270,8 @@
                /* libmysql's documentation says it should be so for SELECT 
statements */
                conn->upsert_status.affected_rows = set->row_count;
        }
-       DBG_INF_FMT("ret=%s row_count=%u warnings=%u server_status=%u", ret == 
PASS? "PASS":"FAIL",
-                               set->row_count, 
conn->upsert_status.warning_count, conn->upsert_status.server_status);
+       DBG_INF_FMT("ret=%s row_count="MYSQLND_LLU_SPEC" warnings=%u 
server_status=%u",
+                               ret == PASS? "PASS":"FAIL", (uint) 
set->row_count, conn->upsert_status.warning_count, 
conn->upsert_status.server_status);
 end:
        PACKET_FREE(row_packet);


Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_result.c
===================================================================
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_result.c      2010-12-16 12:10:03 UTC 
(rev 306404)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_result.c      2010-12-16 12:18:54 UTC 
(rev 306405)
@@ -1270,8 +1270,8 @@
                /* libmysql's documentation says it should be so for SELECT 
statements */
                conn->upsert_status.affected_rows = set->row_count;
        }
-       DBG_INF_FMT("ret=%s row_count=%u warnings=%u server_status=%u", ret == 
PASS? "PASS":"FAIL",
-                               set->row_count, 
conn->upsert_status.warning_count, conn->upsert_status.server_status);
+       DBG_INF_FMT("ret=%s row_count="MYSQLND_LLU_SPEC" warnings=%u 
server_status=%u",
+                               ret == PASS? "PASS":"FAIL", (uint) 
set->row_count, conn->upsert_status.warning_count, 
conn->upsert_status.server_status);
 end:
        PACKET_FREE(row_packet);


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

Reply via email to