Merge branch 'PHP-5.3' into PHP-5.4

adoy · adoy · commit 7f05a39fce42 · 2012-03-24T17:59:46.000-04:00
diff --git a/ext/pdo_mysql/mysql_statement.c b/ext/pdo_mysql/mysql_statement.c
@@ -316,7 +316,6 @@ static int pdo_mysql_stmt_execute(pdo_stmt_t *stmt TSRMLS_DC) /* {{{ */
 {
 	pdo_mysql_stmt *S = (pdo_mysql_stmt*)stmt->driver_data;
 	pdo_mysql_db_handle *H = S->H;
-	my_ulonglong row_count;
 	PDO_DBG_ENTER("pdo_mysql_stmt_execute");
 	PDO_DBG_INF_FMT("stmt=%p", S->stmt);
 

Original file line number	Diff line number	Diff line change
`@@ -316,7 +316,6 @@ static int pdo_mysql_stmt_execute(pdo_stmt_t stmt TSRMLS_DC) / {{{ */`
`316`	`316`	`{`
`317`	`317`	`pdo_mysql_stmt S = (pdo_mysql_stmt)stmt->driver_data;`
`318`	`318`	`pdo_mysql_db_handle *H = S->H;`
`319`		`- my_ulonglong row_count;`
`320`	`319`	`PDO_DBG_ENTER("pdo_mysql_stmt_execute");`
`321`	`320`	`PDO_DBG_INF_FMT("stmt=%p", S->stmt);`
`322`	`321`