diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-05-18 09:21:59 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-05-18 09:21:59 +0300 |
| commit | cc2651b74cbbd8c96fafeb66ca16ca4c2344a4f0 (patch) | |
| tree | 808f9e33addba69df949e981ca1f87d284eaddee /sql/sql_class.h | |
| parent | 81402c131875c5fc2c3c4078bc12770304a48861 (diff) | |
| parent | 4240704abc2d51a2e46fb85049b601fce5d5b24c (diff) | |
| download | mariadb-git-cc2651b74cbbd8c96fafeb66ca16ca4c2344a4f0.tar.gz | |
Merge 10.4 into 10.5
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 e265246b42b..de05b0de384 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -5155,7 +5155,8 @@ public: transaction->all.m_unsafe_rollback_flags|= (transaction->stmt.m_unsafe_rollback_flags & (THD_TRANS::DID_WAIT | THD_TRANS::CREATED_TEMP_TABLE | - THD_TRANS::DROPPED_TEMP_TABLE | THD_TRANS::DID_DDL)); + THD_TRANS::DROPPED_TEMP_TABLE | THD_TRANS::DID_DDL | + THD_TRANS::EXECUTED_TABLE_ADMIN_CMD)); } |