Fix for CONC-301 (manually merged from 2.3.5)

mariadb-corporation · Dec 22, 2017 · 2314598 · 2314598
1 parent 6d2fb01
commit 2314598
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/libmariadb/mariadb_stmt.c b/libmariadb/mariadb_stmt.c
@@ -1395,15 +1395,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)