From 4ab51e7adf282dc9bdef8c3044ccca695a38353a Mon Sep 17 00:00:00 2001 From: Georg Richter Date: Fri, 8 Mar 2019 18:38:14 +0100 Subject: [PATCH] Fix for CONC-301: This fix got lost by a bad previous merge --- libmariadb/mariadb_stmt.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/libmariadb/mariadb_stmt.c b/libmariadb/mariadb_stmt.c index 076ec53a..5b00a1cc 100644 --- a/libmariadb/mariadb_stmt.c +++ b/libmariadb/mariadb_stmt.c @@ -1412,15 +1412,12 @@ int STDCALL mysql_stmt_fetch(MYSQL_STMT *stmt) return(rc); } - if ((rc= stmt->mysql->methods->db_stmt_fetch_to_bind(stmt, row))) - { - return(rc); - } + rc= stmt->mysql->methods->db_stmt_fetch_to_bind(stmt, row); stmt->state= MYSQL_STMT_USER_FETCHING; CLEAR_CLIENT_ERROR(stmt->mysql); CLEAR_CLIENT_STMT_ERROR(stmt); - return(0); + return(rc); } int STDCALL mysql_stmt_fetch_column(MYSQL_STMT *stmt, MYSQL_BIND *bind, unsigned int column, unsigned long offset)