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

wez Sun Apr 9 06:41:42 2006 UTC Modified files: (Branch: PHP_5_1) /php-src/ext/pdo_mysql mysql_statement.c Log: fix for PECL Bug #5827. We're responsible for gobbling up supplemental result sets in closeCursor() (which is what PDO does for us if we didn't implement our own closer routine). http://cvs.php.net/viewcvs.cgi/php-src/ext/pdo_mysql/mysql_statement.c?r1=1.48.2.11&r2=1.48.2.12&diff_format=u Index: php-src/ext/pdo_mysql/mysql_statement.c diff -u php-src/ext/pdo_mysql/mysql_statement.c:1.48.2.11 php-src/ext/pdo_mysql/mysql_statement.c:1.48.2.12 --- php-src/ext/pdo_mysql/mysql_statement.c:1.48.2.11 Tue Feb 14 14:26:11 2006 +++ php-src/ext/pdo_mysql/mysql_statement.c Sun Apr 9 06:41:42 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: mysql_statement.c,v 1.48.2.11 2006/02/14 14:26:11 iliaa Exp $ */ +/* $Id: mysql_statement.c,v 1.48.2.12 2006/04/09 06:41:42 wez Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -590,6 +590,16 @@ mysql_free_result(S->result); S->result = NULL; } +#if HAVE_MYSQL_NEXT_RESULT + while (mysql_more_results(S->H->server)) { + if (mysql_next_result(S->H->server) == 0) { + MYSQL_RES *res = mysql_store_result(S->H->server); + if (res) { + mysql_free_result(res); + } + } + } +#endif return 1; }