From 8823607e299d6028df87d3c389a44ca004311de5 Mon Sep 17 00:00:00 2001 From: Georg Richter Date: Sun, 30 Jun 2019 17:32:03 +0200 Subject: [PATCH] Follow up for CONC-424: Fixed another place where stmt->error wasn't updated correctly. --- libmariadb/mariadb_stmt.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libmariadb/mariadb_stmt.c b/libmariadb/mariadb_stmt.c index 8c70a3c0..43a8aa5b 100644 --- a/libmariadb/mariadb_stmt.c +++ b/libmariadb/mariadb_stmt.c @@ -1716,8 +1716,10 @@ int STDCALL mysql_stmt_store_result(MYSQL_STMT *stmt) if (stmt->mysql->methods->db_command(stmt->mysql, COM_STMT_FETCH, buff, sizeof(buff), 1, stmt)) + { + UPDATE_STMT_ERROR(stmt); return(1); - /* todo: cursor */ + } } else if (stmt->mysql->status != MYSQL_STATUS_STMT_RESULT) { @@ -1891,8 +1893,8 @@ int stmt_read_execute_response(MYSQL_STMT *stmt) } } - if ((stmt->upsert_status.server_status & SERVER_STATUS_CURSOR_EXISTS) && - (stmt->flags & CURSOR_TYPE_READ_ONLY)) + if ((stmt->upsert_status.server_status & SERVER_STATUS_CURSOR_EXISTS) && + (stmt->flags & CURSOR_TYPE_READ_ONLY)) { stmt->cursor_exists = TRUE; mysql->status = MYSQL_STATUS_READY;