diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-05-18 08:59:12 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-05-18 08:59:12 +0300 |
| commit | 4240704abc2d51a2e46fb85049b601fce5d5b24c (patch) | |
| tree | 7a5d40078f39746c649f27fa11ae75d44b509dec /sql/sql_class.h | |
| parent | e861e057ad1b53e38887df66ac816626793c48cd (diff) | |
| parent | ca3f497564f93d2d70d024d996bcd1136bddc5ab (diff) | |
| download | mariadb-git-4240704abc2d51a2e46fb85049b601fce5d5b24c.tar.gz | |
Merge 10.3 into 10.4
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 8edc6225d73..f754524332d 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -4992,7 +4992,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)); } |