MCOL-1156. Server now returns a proper number of affected rows, when …

…using DELETE over JOIN-ed set, to a MariaDB client.
drrtuy · Feb 11, 2018 · 3e14b72 · 3e14b72
1 parent e5499e5
commit 3e14b72
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc
@@ -1345,7 +1345,11 @@ bool multi_delete::send_eof()
 
   if (!local_error && !thd->lex->analyze_stmt)
   {
-    ::my_ok(thd, deleted);
+    if ((thd->infinidb_vtable.isInfiniDBDML))
+    // MCOL-1156. Hack to use THD.m_row_count_func value as affected rows number source. Must be removed.
+	    ::my_ok(thd, thd->get_row_count_func());
+    else
+        ::my_ok(thd, deleted);
   }
   return 0;
 }