summaryrefslogtreecommitdiff
path: root/myisam
diff options
context:
space:
mode:
authorunknown <serg@serg.mysql.com>2001-07-12 14:58:20 +0200
committerunknown <serg@serg.mysql.com>2001-07-12 14:58:20 +0200
commitff0e718de6ada7ed130b4db62d04a7c81315495d (patch)
tree9e895ea707f2e6e14af83adcf28a4f748327818b /myisam
parentf024c2e9d384074ddb6720b9cfde97b6baad431a (diff)
parent6d4dd77271d87d3fac4df8555bc5cef2166e0d66 (diff)
downloadmariadb-git-ff0e718de6ada7ed130b4db62d04a7c81315495d.tar.gz
merged
BitKeeper/etc/logging_ok: auto-union myisam/ft_update.c: Auto merged sql/slave.cc: Auto merged sql/sql_repl.cc: Auto merged
Diffstat (limited to 'myisam')
-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 2dcb3e86cbf..61c6313ec67 100644
--- a/myisam/ft_update.c
+++ b/myisam/ft_update.c
@@ -147,6 +147,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;
}