database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +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

11
sql/sql_class.h
View File

@ -4279,7 +4279,16 @@ public:
{
main_lex.restore_set_statement_var();
}
/* Copy relevant `stmt` transaction flags to `all` transaction. */
void merge_unsafe_rollback_flags()
{
if (transaction.stmt.modified_non_trans_table)
transaction.all.modified_non_trans_table= TRUE;
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));
}
/*
Reset current_linfo
Setting current_linfo to 0 needs to be done with LOCK_thread_count to