diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-12-17 23:24:51 +0200 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-12-17 23:24:51 +0200 |
| commit | e4921f2159a279cfba37a9d3fbfa498141e81b69 (patch) | |
| tree | d2249b595529e043e6b4cbaed529829ac87aacfb /include/m_string.h | |
| parent | 11cbe4271c2f931562bdb5f496dcfa6ebd22760f (diff) | |
| download | mariadb-git-e4921f2159a279cfba37a9d3fbfa498141e81b69.tar.gz | |
Fix after merge
BitKeeper/etc/ignore:
Added libmysqld/sql_do.cc to the ignore list
include/m_string.h:
Fix for purify
libmysql/Makefile.shared:
Fix for purify
libmysqld/Makefile.am:
Fix for purify
sql/sql_handler.cc:
Cleanup
Diffstat (limited to 'include/m_string.h')
| -rw-r--r-- | include/m_string.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/m_string.h b/include/m_string.h index 17b5a07a10b..c6943613b1a 100644 --- a/include/m_string.h +++ b/include/m_string.h @@ -134,6 +134,7 @@ extern int bcmp(const char *s1,const char *s2,uint len); #endif #ifdef HAVE_purify extern int my_bcmp(const char *s1,const char *s2,uint len); +#undef bcmp #define bcmp(A,B,C) my_bcmp((A),(B),(C)) #endif |