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 10.5 into 10.6

Browse Source
This commit is contained in:
Marko Mäkelä
2020-12-03 08:12:47 +02:00
parent e28d9c15c3 f146969fb3
commit a13fac9eee
129 changed files with 2667 additions and 481 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_class.h
View File

@ -4772,6 +4772,13 @@ public:
locked_tables_mode= mode_arg;
}
void leave_locked_tables_mode();
/* Relesae transactional locks if there are no active transactions */
void release_transactional_locks()
{
if (!(server_status &
(SERVER_STATUS_IN_TRANS | SERVER_STATUS_IN_TRANS_READONLY)))
mdl_context.release_transactional_locks(this);
}
int decide_logging_format(TABLE_LIST *tables);
/*
In Some cases when decide_logging_format is called it does not have all