database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge 10.2 into 10.3, except MDEV-25682

Browse Source
This commit is contained in:
Marko Mäkelä
2021-05-18 08:40:19 +03:00
parent 9f03a394ff b9a2e4609f
commit ca3f497564
21 changed files with 722 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sql/handler.h
View File

@ -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"));