Commit d76b88b6 authored by unknown's avatar unknown
Browse files

Fix for the bug #7344 (multiple server_init/server_end lead to crash) 

Some variable wasn't moved to the initial state during mysql_server_end


myisam/ft_stopwords.c:
  resetting ft_stopword_file
sql/mysqld.cc:
  free_charsets() call added
parent 95d3d98b

myisam/ft_stopwords.c

+1 −0
Original line number Diff line number Diff line
@@ -125,4 +125,5 @@ void ft_free_stopwords() 
    my_free((char*) stopwords3,MYF(0));

    stopwords3=0;

  }

  ft_stopword_file= 0;

}

sql/mysqld.cc

+1 −0
Original line number Diff line number Diff line
@@ -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();