diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-12-09 11:24:48 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-12-09 11:24:48 +0100 |
| commit | de22980ac8217c80043a48f3b24ce6b2b21379eb (patch) | |
| tree | dea80cfc5b514944ba5508791bd48934d5cfa7ed /ext/pdo_mysql | |
| parent | c77bf40ad90454d3033b606a0a01746cf2b58f58 (diff) | |
| parent | 18517e7a635e68969ed926f159bb66fb89d5cd3b (diff) | |
| download | php-git-de22980ac8217c80043a48f3b24ce6b2b21379eb.tar.gz | |
Merge branch 'PHP-8.0'
* PHP-8.0:
Fix stmt_free_result implementation and usage
Make XFAILED test less broken
Diffstat (limited to 'ext/pdo_mysql')
| -rw-r--r-- | ext/pdo_mysql/mysql_statement.c | 4 | ||||
| -rw-r--r-- | ext/pdo_mysql/tests/bug_pecl_7976.phpt | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/ext/pdo_mysql/mysql_statement.c b/ext/pdo_mysql/mysql_statement.c index 9d544b23c2..e82cc6ddcc 100644 --- a/ext/pdo_mysql/mysql_statement.c +++ b/ext/pdo_mysql/mysql_statement.c @@ -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)) { diff --git a/ext/pdo_mysql/tests/bug_pecl_7976.phpt b/ext/pdo_mysql/tests/bug_pecl_7976.phpt index 13d4d1b519..af34f02331 100644 --- a/ext/pdo_mysql/tests/bug_pecl_7976.phpt +++ b/ext/pdo_mysql/tests/bug_pecl_7976.phpt @@ -56,8 +56,6 @@ require __DIR__ . '/mysql_pdo_test.inc'; $db = MySQLPDOTest::factory(); $db->exec('DROP PROCEDURE IF EXISTS p'); ?> ---XFAIL-- -Works with mysqlnd. It is not supported by libmysql. For libmysql is good enough to see no crash. --EXPECT-- Emulated... array(1) { |