database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

cleanup: ha_external_unlock() helper

Browse Source 
as mentioned in f9f33b85be and generally to make it
easier to talk about
This commit is contained in:
Sergei Golubchik
2020-04-19 19:47:31 +02:00
parent f29287d280
commit 67aaf51cf9
9 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/opt_range.cc
View File

@@ -1338,7 +1338,7 @@ QUICK_RANGE_SELECT::~QUICK_RANGE_SELECT()
{
DBUG_PRINT("info", ("Freeing separate handler %p (free: %d)", file,
free_file));
file->ha_external_lock(current_thd, F_UNLCK);
file->ha_external_unlock(current_thd);
file->ha_close();
delete file;
}
@@ -1528,7 +1528,7 @@ int QUICK_RANGE_SELECT::init_ror_merged_scan(bool reuse_handler,
if (init())
{
file->ha_external_lock(thd, F_UNLCK);
file->ha_external_unlock(thd);
file->ha_close();
goto failure;
}
@@ -1557,7 +1557,7 @@ end:
{
if (!reuse_handler)
{
file->ha_external_lock(thd, F_UNLCK);
file->ha_external_unlock(thd);
file->ha_close();
goto failure;
}