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/handler.h | |
| parent | 81402c131875c5fc2c3c4078bc12770304a48861 (diff) | |
| parent | 4240704abc2d51a2e46fb85049b601fce5d5b24c (diff) | |
| download | mariadb-git-cc2651b74cbbd8c96fafeb66ca16ca4c2344a4f0.tar.gz | |
Merge 10.4 into 10.5
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 81fbd8303cd..9ae115c59a7 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -1865,9 +1865,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")); |