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 | 9aeaa9468e1d66796b700dfed15435cb1530f9b2 (patch) | |
tree | 649b77f84ffdf6d82c694ace9752240e65c99e1b /myisam/mi_search.c | |
parent | f35600b1d9bf421eba0ce66f89d4a2b7844f4c65 (diff) | |
parent | 7442890e152a05a127a4371eb5a6ad615130b76b (diff) | |
download | mariadb-git-9aeaa9468e1d66796b700dfed15435cb1530f9b2.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/mi_search.c')
-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; } |