summaryrefslogtreecommitdiff
path: root/myisam
diff options
context:
space:
mode:
authorunknown <hf@deer.(none)>2005-02-18 15:51:55 +0400
committerunknown <hf@deer.(none)>2005-02-18 15:51:55 +0400
commitd76b88b65c37e84260f26249cd5a162cb91e328a (patch)
tree0f660bdbe8a79a6eade1b2a1bdc7517e16b05ef9 /myisam
parent95d3d98b0007b70ae51726a084cda369f6d44469 (diff)
downloadmariadb-git-d76b88b65c37e84260f26249cd5a162cb91e328a.tar.gz
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
Diffstat (limited to 'myisam')
-rw-r--r--myisam/ft_stopwords.c1
1 files changed, 1 insertions, 0 deletions
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;
}