Commit 3429ad82 authored by unknown's avatar unknown

Merge deer.(none):/home/hf/work/mysql-4.1.clean

into deer.(none):/home/hf/work/mysql-5.0.clean


sql/mysqld.cc:
  Auto merged
parents 2b1b463c 5b91c5a7
......@@ -125,4 +125,5 @@ void ft_free_stopwords()
my_free((char*) stopwords3,MYF(0));
stopwords3=0;
}
ft_stopword_file= 0;
}
......@@ -964,6 +964,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();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment