Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/dlenev/src/mysql-4.0-bg-1086
This commit is contained in:
commit
423b1b7c4a
@ -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 */
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user