diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2021-11-05 20:33:57 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2021-11-05 20:33:57 +0100 |
| commit | 8635be6a2962f8e256c27836c35064ccaabb7486 (patch) | |
| tree | 06216110c50cfd4a9842271d5d7487a61920a5b9 /sql/sql_class.h | |
| parent | 8d7196cdf165843b7b1271e2616bd57be359e1da (diff) | |
| parent | a19ab67318760f8f155ef7f4f821dfc738542c67 (diff) | |
| download | mariadb-git-8635be6a2962f8e256c27836c35064ccaabb7486.tar.gz | |
Merge branch '10.4' into 10.5mariadb-10.5.13
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 7aac98eccb2..98c4567ffc2 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -5154,7 +5154,8 @@ public: transaction->all.modified_non_trans_table= TRUE; transaction->all.m_unsafe_rollback_flags|= (transaction->stmt.m_unsafe_rollback_flags & - (THD_TRANS::DID_WAIT | THD_TRANS::CREATED_TEMP_TABLE | + (THD_TRANS::MODIFIED_NON_TRANS_TABLE | + THD_TRANS::DID_WAIT | THD_TRANS::CREATED_TEMP_TABLE | THD_TRANS::DROPPED_TEMP_TABLE | THD_TRANS::DID_DDL | THD_TRANS::EXECUTED_TABLE_ADMIN_CMD)); } |