database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge branch '10.1' into 10.2

Browse Source
This commit is contained in:
Sergei Golubchik
2017-07-05 19:08:55 +02:00
parent fc5932a1b7 e555540ab6
commit f6633bf058
99 changed files with 2787 additions and 408 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sql/handler.h
View File

@ -1465,16 +1465,30 @@ struct THD_TRANS
static unsigned int const CREATED_TEMP_TABLE= 0x02;
static unsigned int const DROPPED_TEMP_TABLE= 0x04;
static unsigned int const DID_WAIT= 0x08;
static unsigned int const DID_DDL= 0x10;
void mark_created_temp_table()
{
DBUG_PRINT("debug", ("mark_created_temp_table"));
m_unsafe_rollback_flags|= CREATED_TEMP_TABLE;
}
void mark_dropped_temp_table()
{
DBUG_PRINT("debug", ("mark_dropped_temp_table"));
m_unsafe_rollback_flags|= DROPPED_TEMP_TABLE;
}
bool has_created_dropped_temp_table() const {
return
(m_unsafe_rollback_flags & (CREATED_TEMP_TABLE|DROPPED_TEMP_TABLE)) != 0;
}
void mark_trans_did_wait() { m_unsafe_rollback_flags|= DID_WAIT; }
bool trans_did_wait() const {
return (m_unsafe_rollback_flags & DID_WAIT) != 0;
}
void mark_trans_did_ddl() { m_unsafe_rollback_flags|= DID_DDL; }
bool trans_did_ddl() const {
return (m_unsafe_rollback_flags & DID_DDL) != 0;
}
};