andrey Mon, 21 Feb 2011 16:24:37 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=308540
Log:
fix invalid memory read. Thank you, valgrind
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 2011-02-21
15:56:25 UTC (rev 308539)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c 2011-02-21
16:24:37 UTC (rev 308540)
@@ -1271,7 +1271,7 @@
/* 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="MYSQLND_LLU_SPEC" warnings=%u
server_status=%u",
+ DBG_INF_FMT("ret=%s row_count=%u 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 2011-02-21 15:56:25 UTC
(rev 308539)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_result.c 2011-02-21 16:24:37 UTC
(rev 308540)
@@ -1271,7 +1271,7 @@
/* 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="MYSQLND_LLU_SPEC" warnings=%u
server_status=%u",
+ DBG_INF_FMT("ret=%s row_count=%u 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
