diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-06-22 18:21:21 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-10-12 17:07:33 +0200 |
| commit | 1df5a92df899d033841d77c34e1512e2b118b2ec (patch) | |
| tree | ff7879dbeb9f0afd8ef95cfa4aad0b5ba741ea20 /sql/sql_error.h | |
| parent | 861cd4ce286e7b41cc38facfc86c358e15161a74 (diff) | |
| download | mariadb-git-bb-10.5-MDEV-21916.tar.gz | |
MDEV-21916: COM_STMT_BULK_EXECUTE with RETURNING insert wrong valuesbb-10.5-MDEV-21916
To allocate new net buffer to avoid changing bufer we are reading.
Diffstat (limited to 'sql/sql_error.h')
| -rw-r--r-- | sql/sql_error.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/sql/sql_error.h b/sql/sql_error.h index a0497af78cb..c4ac88d6414 100644 --- a/sql/sql_error.h +++ b/sql/sql_error.h @@ -960,6 +960,8 @@ public: DA_EOF, /** Set whenever one calls my_ok() in PS bulk mode. */ DA_OK_BULK, + /** Set whenever one calls my_eof() in PS bulk mode. */ + DA_EOF_BULK, /** Set whenever one calls my_error() or my_message(). */ DA_ERROR, /** Set in case of a custom response, such as one from COM_STMT_PREPARE. */ @@ -1019,8 +1021,11 @@ public: enum_diagnostics_status status() const { return m_status; } const char *message() const - { DBUG_ASSERT(m_status == DA_ERROR || m_status == DA_OK || - m_status == DA_OK_BULK); return m_message; } + { + DBUG_ASSERT(m_status == DA_ERROR || m_status == DA_OK || + m_status == DA_OK_BULK || m_status == DA_EOF_BULK); + return m_message; + } bool skip_flush() const { @@ -1055,7 +1060,7 @@ public: uint statement_warn_count() const { DBUG_ASSERT(m_status == DA_OK || m_status == DA_OK_BULK || - m_status == DA_EOF); + m_status == DA_EOF ||m_status == DA_EOF_BULK ); return m_statement_warn_count; } |