Commit 7b901892 authored by unknown's avatar unknown

Merge bk-internal.mysql.com:/home/bk/mysql-4.0

into mysql.com:/home/dlenev/src/mysql-4.0-bg-1086

parents 924a9708 83374580
...@@ -125,9 +125,7 @@ extern void bmove_allign(gptr dst,const gptr src,uint len); ...@@ -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)); \ DBUG_ASSERT((A) == (B) || ((A)+(C)) <= (B) || ((B)+(C)) <= (A)); \
bmove((byte*) key,(byte*) from,(size_t) length); bmove((byte*) key,(byte*) from,(size_t) length);
#else #else
#define memcpy_overlap(A,B,C) \ #define memcpy_overlap(A,B,C) memcpy((A), (B), (C))
DBUG_ASSERT((A) == (B) || ((A)+(C)) <= (B) || ((B)+(C)) <= (A)); \
memcpy((A), (B), (C))
#endif /* HAVE_purify */ #endif /* HAVE_purify */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment