diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-05-18 08:40:19 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-05-18 08:40:19 +0300 |
commit | ca3f497564f93d2d70d024d996bcd1136bddc5ab (patch) | |
tree | c89f50b5dd0f2a23d6c1511844c5196909bc5325 /sql/handler.h | |
parent | 9f03a394fff4ae55553eb694f7cba56db15fdb7b (diff) | |
parent | b9a2e4609f93f2cab253f02bc7535960852de3c5 (diff) | |
download | mariadb-git-ca3f497564f93d2d70d024d996bcd1136bddc5ab.tar.gz |
Merge 10.2 into 10.3, except MDEV-25682
Diffstat (limited to 'sql/handler.h')
-rw-r--r-- | sql/handler.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/sql/handler.h b/sql/handler.h index 55c2f0bcd57..29683b54c80 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -1733,9 +1733,19 @@ struct THD_TRANS CREATED_TEMP_TABLE= 2, DROPPED_TEMP_TABLE= 4, DID_WAIT= 8, - DID_DDL= 0x10 + DID_DDL= 0x10, + EXECUTED_TABLE_ADMIN_CMD= 0x20 }; + void mark_executed_table_admin_cmd() + { + DBUG_PRINT("debug", ("mark_executed_table_admin_cmd")); + m_unsafe_rollback_flags|= EXECUTED_TABLE_ADMIN_CMD; + } + bool trans_executed_admin_cmd() + { + return (m_unsafe_rollback_flags & EXECUTED_TABLE_ADMIN_CMD) != 0; + } void mark_created_temp_table() { DBUG_PRINT("debug", ("mark_created_temp_table")); |