summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorserg@serg.mysql.com <>2001-11-10 01:58:40 +0100
committerserg@serg.mysql.com <>2001-11-10 01:58:40 +0100
commit2f51cf20d811327d27396b3ba27ed250ccc528fc (patch)
tree9066ac11a0bf8132f2673855d80d94b98ec9e972
parent316126bf525a008426d100f0c1fb11ac3385759e (diff)
parent7a7f94d80304f3c62c2870b2016394dbac837760 (diff)
downloadmariadb-git-2f51cf20d811327d27396b3ba27ed250ccc528fc.tar.gz
Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
-rw-r--r--myisam/mi_check.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/myisam/mi_check.c b/myisam/mi_check.c
index 656e6aa995f..2bae475e5e1 100644
--- a/myisam/mi_check.c
+++ b/myisam/mi_check.c
@@ -2116,7 +2116,7 @@ static int sort_ft_key_read(SORT_INFO *sort_info, void *key)
{
int error;
MI_INFO *info;
- FT_WORD *wptr;
+ FT_WORD *wptr=0;
DBUG_ENTER("sort_ft_key_read");
info=sort_info->info;
@@ -2125,6 +2125,7 @@ static int sort_ft_key_read(SORT_INFO *sort_info, void *key)
{
do
{
+ my_free((char*) wptr, MYF(MY_ALLOW_ZERO_PTR));
if ((error=sort_get_next_record(sort_info)))
DBUG_RETURN(error);
if (!(wptr=_mi_ft_parserecord(info,sort_info->key,key,sort_info->record)))