summaryrefslogtreecommitdiff
path: root/storage/maria/ma_close.c
diff options
context:
space:
mode:
Diffstat (limited to 'storage/maria/ma_close.c')
-rw-r--r--storage/maria/ma_close.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/storage/maria/ma_close.c b/storage/maria/ma_close.c
index 9463ad8078d..aa4a2f28d9f 100644
--- a/storage/maria/ma_close.c
+++ b/storage/maria/ma_close.c
@@ -114,6 +114,7 @@ int maria_close(register MARIA_HA *info)
}
#ifdef THREAD
thr_lock_delete(&share->lock);
+ (void) pthread_mutex_destroy(&share->key_del_lock);
{
int i,keys;
keys = share->state.header.keys;
@@ -162,14 +163,10 @@ int maria_close(register MARIA_HA *info)
pthread_mutex_unlock(&share->intern_lock);
if (share_can_be_freed)
{
- VOID(pthread_mutex_destroy(&share->intern_lock));
+ (void) pthread_mutex_destroy(&share->intern_lock);
my_free((uchar *)share, MYF(0));
}
- if (info->ftparser_param)
- {
- my_free((uchar*)info->ftparser_param, MYF(0));
- info->ftparser_param= 0;
- }
+ my_free(info->ftparser_param, MYF(MY_ALLOW_ZERO_PTR));
if (info->dfile.file >= 0)
{
/*