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.2 into 10.3

Browse Source
This commit is contained in:
Marko Mäkelä
2020-12-01 14:55:46 +02:00
parent c537576495 e6b3e38d62
commit 81ab9ea63f
66 changed files with 1894 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_prepare.cc
View File

@ -4247,7 +4247,7 @@ bool Prepared_statement::prepare(const char *packet, uint packet_len)
if (thd->transaction_rollback_request)
{
trans_rollback_implicit(thd);
thd->mdl_context.release_transactional_locks();
thd->release_transactional_locks();
}
/* Preserve CHANGE MASTER attributes */