database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-02 09:41:40 +03:00
Code Activity

Merge 10.2 into bb-10.2-ext

Browse Source
This commit is contained in:
Marko Mäkelä
2017-06-27 08:13:59 +03:00
parent ed61fddf24 29624ea304
commit 43c77bb937
79 changed files with 2852 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_parse.cc
View File

@@ -2799,6 +2799,7 @@ retry:
! table->prelocking_placeholder &&
table->table->file->lock_count() == 0)
{
enum enum_mdl_type lock_type;
/*
In case when LOCK TABLE ... READ LOCAL was issued for table with
storage engine which doesn't support READ LOCAL option and doesn't
@@ -2811,9 +2812,12 @@ retry:
deadlock_handler.init();
thd->push_internal_handler(&deadlock_handler);
lock_type= table->table->mdl_ticket->get_type() == MDL_SHARED_WRITE ?
MDL_SHARED_NO_READ_WRITE : MDL_SHARED_READ_ONLY;
bool result= thd->mdl_context.upgrade_shared_lock(
table->table->mdl_ticket,
MDL_SHARED_READ_ONLY,
lock_type,
thd->variables.lock_wait_timeout);
thd->pop_internal_handler();