diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-12-11 12:21:11 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-12-11 12:21:11 +0100 |
| commit | 96ec26ec719388d095254794cc0cf2c8d8f2b9ad (patch) | |
| tree | 51a43acea91db7f9954491c79a9a9d85644b6fc3 /ext/pdo_mysql/mysql_statement.c | |
| parent | 09cc0963574da507a1a4b01f7edfcea07a9aebcf (diff) | |
| parent | d6b4b82a386402058c0eceaec31cfd7b5da765f8 (diff) | |
| download | php-git-96ec26ec719388d095254794cc0cf2c8d8f2b9ad.tar.gz | |
Merge branch 'PHP-8.0'
* PHP-8.0:
PDO MySQL: Use stmt_next_result with libmysqlclient as well
PDO MySQL: Fix libmysql option test
Diffstat (limited to 'ext/pdo_mysql/mysql_statement.c')
| -rw-r--r-- | ext/pdo_mysql/mysql_statement.c | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/ext/pdo_mysql/mysql_statement.c b/ext/pdo_mysql/mysql_statement.c index 46f39c985d..80d8747cd9 100644 --- a/ext/pdo_mysql/mysql_statement.c +++ b/ext/pdo_mysql/mysql_statement.c @@ -341,30 +341,29 @@ static int pdo_mysql_stmt_next_rowset(pdo_stmt_t *stmt) /* {{{ */ PDO_DBG_INF_FMT("stmt=%p", S->stmt); /* ensure that we free any previous unfetched results */ - if (S->stmt) { - mysql_stmt_free_result(S->stmt); - } pdo_mysql_free_result(S); -#ifdef PDO_USE_MYSQLND if (S->stmt) { - if (mysqlnd_stmt_next_result(S->stmt)) { + mysql_stmt_free_result(S->stmt); + if (mysql_stmt_next_result(S->stmt)) { + pdo_mysql_error_stmt(stmt); + S->done = 1; + PDO_DBG_RETURN(0); + } + } else { + if (mysql_next_result(H->server)) { pdo_mysql_error_stmt(stmt); S->done = 1; PDO_DBG_RETURN(0); } + } +#ifdef PDO_USE_MYSQLND + if (S->stmt) { PDO_DBG_RETURN(pdo_mysql_stmt_after_execute_prepared(stmt)); } #endif - - if (mysql_next_result(H->server)) { - pdo_mysql_error_stmt(stmt); - S->done = 1; - PDO_DBG_RETURN(0); - } else { - PDO_DBG_RETURN(pdo_mysql_fill_stmt_from_result(stmt)); - } + PDO_DBG_RETURN(pdo_mysql_fill_stmt_from_result(stmt)); } /* }}} */ |