summaryrefslogtreecommitdiff
path: root/storage/myisam
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2020-04-22 18:18:51 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2020-04-22 18:18:51 +0300
commit88cf6f1c7ff5d56138c8b53a5adaca4c61752f86 (patch)
treeeee8eed7e9388a575de4d9c948b0706e2356d694 /storage/myisam
parent498c5e2be1021569c1d5554bcb91f45090e30d4b (diff)
parent455cf6196c8c73f5a50004ac7f31a9be8ac14bbe (diff)
downloadmariadb-git-88cf6f1c7ff5d56138c8b53a5adaca4c61752f86.tar.gz
Merge 10.3 into 10.4
Diffstat (limited to 'storage/myisam')
-rw-r--r--storage/myisam/mi_close.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/storage/myisam/mi_close.c b/storage/myisam/mi_close.c
index 5f84eb89c28..56197729251 100644
--- a/storage/myisam/mi_close.c
+++ b/storage/myisam/mi_close.c
@@ -20,7 +20,7 @@
to open other files during the time we flush the cache and close this file
*/
-#include "myisamdef.h"
+#include "ftdefs.h"
int mi_close(register MI_INFO *info)
{
@@ -60,6 +60,8 @@ int mi_close(register MI_INFO *info)
mysql_mutex_unlock(&share->intern_lock);
my_free(mi_get_rec_buff_ptr(info, info->rec_buff));
+ ftparser_call_deinitializer(info);
+
if (flag)
{
DBUG_EXECUTE_IF("crash_before_flush_keys",