summaryrefslogtreecommitdiff
path: root/sql/sql_error.h
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2016-07-02 15:02:21 +0200
committerOleksandr Byelkin <sanja@mariadb.com>2016-07-27 19:00:54 +0200
commitc7c7755e0de494ef8e898708c5b13c6f7abf24ee (patch)
tree205ebf6ea2f25a88ba768245b748a8d8d2634a07 /sql/sql_error.h
parent41535a435dff427252cf56abe07f69a356cdcb38 (diff)
downloadmariadb-git-10.2-MDEV-9114.tar.gz
Separate command removed.10.2-MDEV-9114
Default value indicator for INSERT added. Bugs fixed.
Diffstat (limited to 'sql/sql_error.h')
-rw-r--r--sql/sql_error.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/sql_error.h b/sql/sql_error.h
index 70d40e3e6a0..aa8e6c6b0f3 100644
--- a/sql/sql_error.h
+++ b/sql/sql_error.h
@@ -712,7 +712,10 @@ public:
m_status == DA_OK_BULK); return m_message; }
bool skip_flush() const
- { DBUG_ASSERT(m_status == DA_OK); return m_skip_flush; }
+ {
+ DBUG_ASSERT(m_status == DA_OK || m_status == DA_OK_BULK);
+ return m_skip_flush;
+ }
void set_skip_flush()
{ m_skip_flush= TRUE; }