summaryrefslogtreecommitdiff
path: root/include/m_string.h
diff options
context:
space:
mode:
authorjani@ua141d10.elisa.omakaista.fi <>2005-10-13 18:23:53 +0300
committerjani@ua141d10.elisa.omakaista.fi <>2005-10-13 18:23:53 +0300
commit2dd1e4f94ef2e2ec8e9daeb4903a711dd9a3c1c9 (patch)
tree110201972d71b85d5c8e4bf068770a1ffd6fca61 /include/m_string.h
parentfbd5140f2bc7cd53042e633909ad5e4ade9e1200 (diff)
parentcf173e553d7df42c53f4cdd4b29bbbf1c8b702d8 (diff)
downloadmariadb-git-2dd1e4f94ef2e2ec8e9daeb4903a711dd9a3c1c9.tar.gz
Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1-tmp
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
Diffstat (limited to 'include/m_string.h')
-rw-r--r--include/m_string.h9
1 files changed, 0 insertions, 9 deletions
diff --git a/include/m_string.h b/include/m_string.h
index 33ba9c155c2..c02ce92cd88 100644
--- a/include/m_string.h
+++ b/include/m_string.h
@@ -129,15 +129,6 @@ extern void bmove_align(gptr dst,const gptr src,uint len);
#define bmove512(A,B,C) memcpy(A,B,C)
#endif
-#ifdef HAVE_purify
-#define memcpy_overlap(A,B,C) \
-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))
-#endif /* HAVE_purify */
-
-
/* Prototypes for string functions */
#if !defined(bfill) && !defined(HAVE_BFILL)