bk commit into 4.1 tree (dean:1.2458) BUG#13582

[Dean Ellis]

Below is the list of changes that have just been committed into a local
4.1 repository of dellis. When dellis does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2458 05/09/28 19:03:35 dean@stripped +1 -0
  Fix for BUG#13582.  Theoretically possible to try to overallocate RAM in some fulltext
queries.

  myisam/ft_nlq_search.c
    1.39 05/09/28 19:02:23 dean@stripped +2 -1

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	dean
# Host:	niflheim.lan
# Root:	/home/dellis/mysqlab/bk/mysql-4.1

--- 1.38/myisam/ft_nlq_search.c	2005-02-15 17:30:39 -06:00
+++ 1.39/myisam/ft_nlq_search.c	2005-09-28 19:02:23 -05:00
@@ -266,7 +266,8 @@
     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),
+			     sizeof(FT_DOC)*
+			     (int)(aio.dtree.elements_in_tree-1),
 			     MYF(0));
   if (!dlist)
     goto err;