diff options
| author | unknown <dlenev@mysql.com> | 2003-08-20 18:16:08 +0400 |
|---|---|---|
| committer | unknown <dlenev@mysql.com> | 2003-08-20 18:16:08 +0400 |
| commit | 7b9018920bde4eebd52d272f198c4aec53bdf581 (patch) | |
| tree | f24800feed988aff2b33d147ebde863ad375c534 | |
| parent | 924a9708c9fac8036eba55fe8c254a55d25023d1 (diff) | |
| parent | 83374580c2e9f1cc919ac5d8babb0e1f8ddd40fc (diff) | |
| download | mariadb-git-7b9018920bde4eebd52d272f198c4aec53bdf581.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/dlenev/src/mysql-4.0-bg-1086
| -rw-r--r-- | include/m_string.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/m_string.h b/include/m_string.h index eae0e8f3f94..eac1552f8c1 100644 --- a/include/m_string.h +++ b/include/m_string.h @@ -125,9 +125,7 @@ extern void bmove_allign(gptr dst,const gptr src,uint len); 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) \ -DBUG_ASSERT((A) == (B) || ((A)+(C)) <= (B) || ((B)+(C)) <= (A)); \ -memcpy((A), (B), (C)) +#define memcpy_overlap(A,B,C) memcpy((A), (B), (C)) #endif /* HAVE_purify */ |