database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

MDEV-18496 Crash when Aria encryption is enabled but plugin not available

Browse Source 
wait_while_table_is_used() should return an error if handler::extra() fails
This commit is contained in:
Sergei Golubchik
2020-05-17 18:34:22 +02:00
parent e6cb263ef3
commit 88cbe2f081
4 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_base.cc
View File

@ -1892,7 +1892,7 @@ bool wait_while_table_is_used(THD *thd, TABLE *table,
FALSE);
/* extra() call must come only after all instances above are closed */
if (function != HA_EXTRA_NOT_USED)
(void) table->file->extra(function);
DBUG_RETURN(table->file->extra(function));
DBUG_RETURN(FALSE);
}