database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-02 14:47:37 +03:00
Code Activity

Merge 10.2 into 10.3

Browse Source
This commit is contained in:
Marko Mäkelä
2018-03-29 17:03:34 +03:00
parent 4277c173a9 014dfe473a
commit 980dd09be6
22 changed files with 287 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_base.cc
View File

@ -484,7 +484,7 @@ err_with_reopen:
old locks. This should always succeed (unless some external process
has removed the tables)
*/
thd->locked_tables_list.reopen_tables(thd);
result= thd->locked_tables_list.reopen_tables(thd);
/*
Since downgrade_lock() won't do anything with shared
metadata lock it is much simpler to go through all open tables rather