archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix stmt_free_result implementation and usage

Browse source 
Two bugs both affecting the bug_pecl_7976.phpt test ("works with
mysqlnd" haha):

 * We should not change the connection state in stmt_free_result.
   This makes mysql_stmt_free_result usable under mysqlnd and
   not just libmysqlclient.
 * If we call mysql_stmt_free_result, we still need to consume
   any outstanding result sets.
This commit is contained in:
Nikita Popov 2020-12-09 11:13:48 +01:00
parent 9c0712d2cd
commit 18517e7a63
3 changed files with 1 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ext/pdo_mysql/mysql_statement.c
View file

@ -893,9 +893,7 @@ static int pdo_mysql_stmt_cursor_closer(pdo_stmt_t *stmt) /* {{{ */
S->result = NULL;
}
if (S->stmt) {
int retval;
retval = mysql_stmt_free_result(S->stmt);
PDO_DBG_RETURN(retval ? 0 : 1);
mysql_stmt_free_result(S->stmt);
}
while (mysql_more_results(S->H->server)) {