From e2041167346bd91d796c739cf7ab9de052283cb7 Mon Sep 17 00:00:00 2001
From: Nirbhay Choubey <nirbhay@mariadb.com>
Date: Tue, 14 Jul 2015 17:21:35 -0400
Subject: [PATCH] Check supress_my_ok before sending Ok packet (logic lost
 during merge).

---
 sql/sql_insert.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc
index 23043840f12..08215980534 100644
--- a/sql/sql_insert.cc
+++ b/sql/sql_insert.cc
@@ -3798,7 +3798,7 @@ bool select_insert::send_eof()
 {
   bool res;
   DBUG_ENTER("select_insert::send_eof");
-  res= (prepare_eof() || send_ok_packet());
+  res= (prepare_eof() || (!suppress_my_ok && send_ok_packet()));
   DBUG_RETURN(res);
 }