summaryrefslogtreecommitdiff
path: root/myisam/mi_search.c
diff options
context:
space:
mode:
authorunknown <jani@ua141d10.elisa.omakaista.fi>2005-10-13 18:23:53 +0300
committerunknown <jani@ua141d10.elisa.omakaista.fi>2005-10-13 18:23:53 +0300
commitd123ef7aaa06ee543d2a95ff3a83533f99396cbf (patch)
tree110201972d71b85d5c8e4bf068770a1ffd6fca61 /myisam/mi_search.c
parent3e4dcfe5b7e1892a69fcca077a038b818aa5e030 (diff)
parenta86c7d18a0309e740b7bc570259d6bede8287a4b (diff)
downloadmariadb-git-d123ef7aaa06ee543d2a95ff3a83533f99396cbf.tar.gz
Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1-tmp
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0 configure.in: Auto merged include/config-win.h: Auto merged include/m_string.h: Auto merged include/my_pthread.h: Auto merged myisam/mi_search.c: Auto merged mysql-test/r/cast.result: Auto merged mysql-test/t/cast.test: Auto merged mysql-test/t/select.test: Auto merged mysys/my_pthread.c: Auto merged mysys/thr_alarm.c: Auto merged netware/pack_isam.def: Auto merged sql/item.h: Auto merged sql/item_cmpfunc.cc: Auto merged strings/ctype-big5.c: Auto merged strings/ctype-tis620.c: Auto merged strings/xml.c: Auto merged vio/vio.c: Auto merged vio/viosocket.c: Auto merged mysql-test/r/select.result: Merged from 4.1. netware/BUILD/mwenv: Merged from 4.1. scripts/make_binary_distribution.sh: Merged from 4.1. sql/mysqld.cc: Merged from 4.1. sql/sql_show.cc: Merged from 4.1. strings/my_strtoll10.c: Merged from 4.1.
Diffstat (limited to 'myisam/mi_search.c')
-rw-r--r--myisam/mi_search.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/myisam/mi_search.c b/myisam/mi_search.c
index d0572646a97..92efdfee457 100644
--- a/myisam/mi_search.c
+++ b/myisam/mi_search.c
@@ -986,7 +986,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;
}