summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <serg@serg.mysql.com>2001-07-12 14:24:47 +0200
committerunknown <serg@serg.mysql.com>2001-07-12 14:24:47 +0200
commit6d4dd77271d87d3fac4df8555bc5cef2166e0d66 (patch)
treebde44658759051789ddc64aeb969287177867a56
parent7cc86549bce7f503b592ef1c5cdb660ed7864e25 (diff)
parent7b0cf9180a54f463307315b837c96e1884eb6886 (diff)
downloadmariadb-git-6d4dd77271d87d3fac4df8555bc5cef2166e0d66.tar.gz
Merge work:/home/bk/mysql into serg.mysql.com:/usr/home/serg/Abk/mysql
-rw-r--r--myisam/ft_update.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/myisam/ft_update.c b/myisam/ft_update.c
index 658ea9282f3..753c4dc4029 100644
--- a/myisam/ft_update.c
+++ b/myisam/ft_update.c
@@ -145,6 +145,10 @@ int _mi_ft_cmp(MI_INFO *info, uint keynr, const byte *rec1, const byte *rec2)
memcpy_fixed(&pos2,pos2+keyseg->bit_start,sizeof(char*));
set_if_smaller(len2,keyseg->length);
}
+ else /* fixed length key */
+ {
+ len1=len2=keyseg->length;
+ }
if ((len1 != len2) || memcmp(pos1, pos2, len1))
return THOSE_TWO_DAMN_KEYS_ARE_REALLY_DIFFERENT;
}