diff options
| author | monty@mysql.com <> | 2004-03-29 19:21:53 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-03-29 19:21:53 +0300 |
| commit | dc2f606fb85e0763a448132a147a816de829a8cb (patch) | |
| tree | f51ea3945f84d672edc962cdfc11eab16f569fc5 /include/m_string.h | |
| parent | 505970b4a76f3d41f338d32d3d4382891ecb0ec3 (diff) | |
| parent | 3cbab63af1e92677217be8106d5ed696b20521b1 (diff) | |
| download | mariadb-git-dc2f606fb85e0763a448132a147a816de829a8cb.tar.gz | |
Merge with 4.0 to get lastest bug fixes
Diffstat (limited to 'include/m_string.h')
| -rw-r--r-- | include/m_string.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/m_string.h b/include/m_string.h index 21aa736acd4..c86801ae2d2 100644 --- a/include/m_string.h +++ b/include/m_string.h @@ -125,7 +125,7 @@ extern void bmove_align(gptr dst,const gptr src,uint len); #ifdef HAVE_purify #include <assert.h> #define memcpy_overlap(A,B,C) \ -DBUG_ASSERT((A) == (B) || ((A)+(C)) <= (B) || ((B)+(C)) <= (A)); \ +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)) |