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 /include/m_string.h | |
| 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 'include/m_string.h')
| -rw-r--r-- | include/m_string.h | 9 |
1 files changed, 0 insertions, 9 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) |