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.4' into 10.5

Browse Source
This commit is contained in:
Oleksandr Byelkin
2020-03-11 17:52:49 +01:00
parent 9d7ed94f6a b7362d5fbc
commit fad47df995
132 changed files with 2878 additions and 2138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_class.cc
View File

@ -2231,11 +2231,6 @@ void THD::reset_globals()
net.thd= 0;
}
bool THD::trace_started()
{
return opt_trace.is_started();
}
/*
Cleanup after query.
@ -5690,6 +5685,7 @@ void THD::leave_locked_tables_mode()
{
if (locked_tables_mode == LTM_LOCK_TABLES)
{
DBUG_ASSERT(current_backup_stage == BACKUP_FINISHED);
/*
When leaving LOCK TABLES mode we have to change the duration of most
of the metadata locks being held, except for HANDLER and GRL locks,