mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-15 19:37:16 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge mysql.com:/home/dellis/bkl/bug-4.1

Browse source 
into mysql.com:/home/dellis/bkl/bug-5.0


BitKeeper/etc/logging_ok:
  auto-union
mysql-test/r/fulltext.result:
  Auto merged
This commit is contained in:
unknown 2005-02-16 17:35:00 -06:00
commit 6bb46afb5d
4 changed files with 21 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
myisam/ft_nlq_search.c
View file

@ -261,6 +261,10 @@ FT_INFO *ft_init_nlq_search(MI_INFO *info, uint keynr, byte *query,
}
/*
If ndocs == 0, this will not allocate RAM for FT_INFO.doc[],
so if ndocs == 0, FT_INFO.doc[] must not be accessed.
*/
dlist=(FT_INFO *)my_malloc(sizeof(FT_INFO)+
sizeof(FT_DOC)*(aio.dtree.elements_in_tree-1),
MYF(0));
@ -329,7 +333,8 @@ float ft_nlq_find_relevance(FT_INFO *handler,
else
a=c;
}
if (docs[a].dpos == docid)
/* bounds check to avoid accessing unallocated handler->doc */
if (a < handler->ndocs && docs[a].dpos == docid)
return (float) docs[a].weight;
else
return 0.0;