diff options
| author | dean@mysql.com <> | 2005-10-06 15:52:01 -0500 |
|---|---|---|
| committer | dean@mysql.com <> | 2005-10-06 15:52:01 -0500 |
| commit | 59e35d6253515f5c0ed3f094c040e832258ce2a4 (patch) | |
| tree | 2364bf132c8e223b244619051b8d86903232b4a7 /myisam | |
| parent | 8c2ab38c381604932137f695ababdfd73f075110 (diff) | |
| parent | e82647cd9cd67955d25406ecd37addeace4ba079 (diff) | |
| download | mariadb-git-59e35d6253515f5c0ed3f094c040e832258ce2a4.tar.gz | |
Merge mysql.com:/home/dellis/mysqlab/bk/local_mysql-4.1
into mysql.com:/home/dellis/mysqlab/bk/mysql-5.0
Diffstat (limited to 'myisam')
| -rw-r--r-- | myisam/ft_nlq_search.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/myisam/ft_nlq_search.c b/myisam/ft_nlq_search.c index 7a506fd11c6..8460db61a36 100644 --- a/myisam/ft_nlq_search.c +++ b/myisam/ft_nlq_search.c @@ -266,7 +266,8 @@ FT_INFO *ft_init_nlq_search(MI_INFO *info, uint keynr, byte *query, 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; |