diff options
| -rw-r--r-- | include/m_string.h | 9 | ||||
| -rw-r--r-- | myisam/mi_search.c | 2 |
2 files changed, 1 insertions, 10 deletions
diff --git a/include/m_string.h b/include/m_string.h index d3465363beb..d7edff4f626 100644 --- a/include/m_string.h +++ b/include/m_string.h @@ -122,15 +122,6 @@ extern void bmove_align(gptr dst,const gptr src,uint len); #define bmove512(A,B,C) memcpy(A,B,C) #endif -#ifdef HAVE_purify -#define memcpy_overlap(A,B,C) \ -DBUG_ASSERT((A) <= (B) || ((B)+(C)) <= (A)); \ -bmove((byte*) (A),(byte*) (B),(size_t) (C)); -#else -#define memcpy_overlap(A,B,C) memcpy((A), (B), (C)) -#endif /* HAVE_purify */ - - /* Prototypes for string functions */ #if !defined(bfill) && !defined(HAVE_BFILL) 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; } |