Fix direct_update error handling.

2 files changed, 5 insertions, 9 deletions

diff --git a/storage/clustrixdb/clustrix_connection.cc b/storage/clustrixdb/clustrix_connection.cc
index 7d7848db8dc..aca69877ef5 100644
--- a/storage/clustrixdb/clustrix_connection.cc
+++ b/storage/clustrixdb/clustrix_connection.cc
@@ -731,13 +731,12 @@ int clustrix_connection::update_query(String &stmt, LEX_CSTRING &dbname,
   if ((error_code = send_command()))
     return error_code;
 
-  if ((error_code = read_query_response()))
-    return error_code;
-
+  error_code = read_query_response();
   auto_commit_closed();
-  *affected_rows = clustrix_net.affected_rows;
+  if (!error_code)
+    *affected_rows = clustrix_net.affected_rows;
 
-  return 0;
+  return error_code;
 }
 
 
diff --git a/storage/clustrixdb/ha_clustrixdb.cc b/storage/clustrixdb/ha_clustrixdb.cc
index 1f548a45081..46b72366d9a 100644
--- a/storage/clustrixdb/ha_clustrixdb.cc
+++ b/storage/clustrixdb/ha_clustrixdb.cc
@@ -573,10 +573,7 @@ int ha_clustrixdb::direct_update_rows(ha_rows *update_rows)
   if (!thd_test_options(thd, OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN))
     trx->auto_commit_next();
 
-  trx->update_query(update_stmt, table->s->db, update_rows);
-
-  thd->get_stmt_da()->set_overwrite_status(true);
-
+  error_code = trx->update_query(update_stmt, table->s->db, update_rows);
   DBUG_RETURN(error_code);
 }