diff options
author | unknown <ramil@mysql.com> | 2005-10-13 12:48:30 +0500 |
---|---|---|
committer | unknown <ramil@mysql.com> | 2005-10-13 12:48:30 +0500 |
commit | 5de7ba46e808d81516f26578433c161c38028c7b (patch) | |
tree | 649b77f84ffdf6d82c694ace9752240e65c99e1b /myisam | |
parent | 62002fdc00aa1995a8df5457beaccf2183065369 (diff) | |
parent | 6c89848de9f3bedf0a1d5e6721f9c88959a9f9b4 (diff) | |
download | mariadb-git-5de7ba46e808d81516f26578433c161c38028c7b.tar.gz |
Merge mysql.com:/usr/home/ram/work/mysql-4.0
into mysql.com:/usr/home/ram/work/mysql-4.1
myisam/mi_search.c:
Auto merged
include/m_string.h:
SCCS merged
Diffstat (limited to 'myisam')
-rw-r--r-- | myisam/mi_search.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/myisam/mi_search.c b/myisam/mi_search.c index 71a623dc9c0..4ea2480889e 100644 --- a/myisam/mi_search.c +++ b/myisam/mi_search.c @@ -978,7 +978,7 @@ uint _mi_get_binary_pack_key(register MI_KEYDEF *keyinfo, uint nod_flag, } DBUG_PRINT("info",("key: %lx from: %lx length: %u", (long) key, (long) from, length)); - memcpy_overlap((byte*) key, (byte*) from, (size_t) length); + memmove((byte*) key, (byte*) from, (size_t) length); key+=length; from+=length; } |