summaryrefslogtreecommitdiff
path: root/storage/myisam/ft_update.c
diff options
context:
space:
mode:
Diffstat (limited to 'storage/myisam/ft_update.c')
-rw-r--r--storage/myisam/ft_update.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/storage/myisam/ft_update.c b/storage/myisam/ft_update.c
index f851c0236ae..51d8ee81339 100644
--- a/storage/myisam/ft_update.c
+++ b/storage/myisam/ft_update.c
@@ -281,17 +281,10 @@ uint _ft_make_key(MI_INFO *info, uint keynr, uchar *keybuf, FT_WORD *wptr,
my_off_t filepos)
{
uchar buf[HA_FT_MAXBYTELEN+16];
+ float weight=(float) ((filepos==HA_OFFSET_ERROR) ? 0 : wptr->weight);
DBUG_ENTER("_ft_make_key");
-#if HA_FT_WTYPE == HA_KEYTYPE_FLOAT
- {
- float weight=(float) ((filepos==HA_OFFSET_ERROR) ? 0 : wptr->weight);
- mi_float4store(buf,weight);
- }
-#else
-#error
-#endif
-
+ mi_float4store(buf,weight);
int2store(buf+HA_FT_WLEN,wptr->len);
memcpy(buf+HA_FT_WLEN+2,wptr->pos,wptr->len);
DBUG_RETURN(_mi_make_key(info,keynr,(uchar*) keybuf,buf,filepos));