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.0' into 10.1

Browse Source
This commit is contained in:
Sergei Golubchik
2018-05-05 14:01:59 +02:00
parent 39d248fa55 3c07ed141c
commit 9989c26bc9
178 changed files with 3829 additions and 2475 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_base.cc
View File

@ -995,10 +995,7 @@ void close_thread_tables(THD *thd)
we will exit this function a few lines below.
*/
if (! thd->lex->requires_prelocking())
{
thd->locked_tables_list.reopen_tables(thd, true);
DBUG_VOID_RETURN;
}
/*
We are in the top-level statement of a prelocked statement,