diff --git a/myisam/ft_stopwords.c b/myisam/ft_stopwords.c
index 112af87d201..a4bce6ad4e8 100644
--- a/myisam/ft_stopwords.c
+++ b/myisam/ft_stopwords.c
@@ -125,4 +125,5 @@ void ft_free_stopwords()
     my_free((char*) stopwords3,MYF(0));
     stopwords3=0;
   }
+  ft_stopword_file= 0;
 }
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 53dca59bc92..a4a2fd5e1ef 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -950,6 +950,7 @@ void clean_up(bool print_message)
   item_user_lock_free();
   lex_free();				/* Free some memory */
   set_var_free();
+  free_charsets();
 #ifdef HAVE_DLOPEN
   if (!opt_noacl)
     udf_free();