cvs: php-src(PHP_5_1) /ext/pdo_mysql mysql_statement.c

From: Date: Thu, 27 Oct 2005 17:26:19 +0000
Subject: cvs: php-src(PHP_5_1) /ext/pdo_mysql mysql_statement.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-34827@lists.php.net to get a copy of this message
tony2001 Thu Oct 27 13:26:19 2005 EDT Modified files: (Branch: PHP_5_1) /php-src/ext/pdo_mysql mysql_statement.c Log: MFH: free && set to NULL S->stmt http://cvs.php.net/diff.php/php-src/ext/pdo_mysql/mysql_statement.c?r1=1.48.2.4&r2=1.48.2.5&ty=u Index: php-src/ext/pdo_mysql/mysql_statement.c diff -u php-src/ext/pdo_mysql/mysql_statement.c:1.48.2.4 php-src/ext/pdo_mysql/mysql_statement.c:1.48.2.5 --- php-src/ext/pdo_mysql/mysql_statement.c:1.48.2.4 Wed Oct 19 10:11:56 2005 +++ php-src/ext/pdo_mysql/mysql_statement.c Thu Oct 27 13:26:19 2005 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: mysql_statement.c,v 1.48.2.4 2005/10/19 14:11:56 iliaa Exp $ */ +/* $Id: mysql_statement.c,v 1.48.2.5 2005/10/27 17:26:19 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -241,6 +241,12 @@ int ret; /* ensure that we free any previous unfetched results */ +#if HAVE_MYSQL_STMT_PREPARE + if (S->stmt) { + mysql_stmt_free_result(S->stmt); + S->stmt = NULL; + } +#endif if (S->result) { mysql_free_result(S->result); S->result = NULL; @@ -567,7 +573,9 @@ pdo_mysql_stmt *S = (pdo_mysql_stmt*)stmt->driver_data; #if HAVE_MYSQL_STMT_PREPARE if (S->stmt) { - return mysql_stmt_free_result(S->stmt); + int retval = mysql_stmt_free_result(S->stmt); + S->stmt = NULL; + return retval ? 0 : 1; } #endif if (S->result) {

« previous php.cvs (#34827) next »