Merge branch '10.2' into 10.2-mdev986410.2-test1234

1 files changed, 9 insertions, 0 deletions

diff --git a/sql/sql_error.h b/sql/sql_error.h
index e03c3dd4a93..8fb1abacf2b 100644
--- a/sql/sql_error.h
+++ b/sql/sql_error.h
@@ -704,6 +704,12 @@ public:
   const char *message() const
   { DBUG_ASSERT(m_status == DA_ERROR || m_status == DA_OK); return m_message; }
 
+  bool skip_flush() const
+  { DBUG_ASSERT(m_status == DA_OK); return m_skip_flush; }
+
+  void set_skip_flush()
+  { m_skip_flush= TRUE; }
+
   uint sql_errno() const
   { DBUG_ASSERT(m_status == DA_ERROR); return m_sql_errno; }
 
@@ -857,6 +863,9 @@ private:
   /** Set to make set_error_status after set_{ok,eof}_status possible. */
   bool m_can_overwrite_status;
 
+  /** Skip flushing network buffer after writing OK (for COM_MULTI) */
+  bool m_skip_flush;
+
   /** Message buffer. Can be used by OK or ERROR status. */
   char m_message[MYSQL_ERRMSG_SIZE];