diff options
| author | monty@narttu.mysql.fi <> | 2003-08-29 13:44:35 +0300 |
|---|---|---|
| committer | monty@narttu.mysql.fi <> | 2003-08-29 13:44:35 +0300 |
| commit | 77a70a0a24ce658a3ee55248cb2e76f84afc1b88 (patch) | |
| tree | aeb2314adbd714c7e2b032209bfd7914e3cfda3d /include/m_string.h | |
| parent | 6cad89775b4ed78c02c2fa9f3e49181f63b7fb65 (diff) | |
| parent | 5e04e2370f05bc42437f8be476eba9e204888b65 (diff) | |
| download | mariadb-git-77a70a0a24ce658a3ee55248cb2e76f84afc1b88.tar.gz | |
merge with 4.0.15
Diffstat (limited to 'include/m_string.h')
| -rw-r--r-- | include/m_string.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/m_string.h b/include/m_string.h index 5863bb51b73..062d0b4cf65 100644 --- a/include/m_string.h +++ b/include/m_string.h @@ -122,6 +122,16 @@ extern void bmove_align(gptr dst,const gptr src,uint len); #define bmove512(A,B,C) memcpy(A,B,C) #endif +#ifdef HAVE_purify +#include <assert.h> +#define memcpy_overlap(A,B,C) \ +DBUG_ASSERT((A) == (B) || ((A)+(C)) <= (B) || ((B)+(C)) <= (A)); \ +bmove((byte*) key,(byte*) from,(size_t) length); +#else +#define memcpy_overlap(A,B,C) memcpy((A), (B), (C)) +#endif /* HAVE_purify */ + + /* Prototypes for string functions */ #if !defined(bfill) && !defined(HAVE_BFILL) |