diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-08-05 22:56:11 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-08-05 22:56:11 +0300 |
| commit | d042146e5b41b6222df3e6b4c16a44f3ef2939b7 (patch) | |
| tree | e40f5b435f7d17ed1c24dfb787ab8cd5f4f7d5d8 /include/m_string.h | |
| parent | 3e610bc58d0ba325fdca3b06dfa976ecc513dc1e (diff) | |
| parent | f0f21036951f6fed2fddeb58375425f957751fd5 (diff) | |
| download | mariadb-git-d042146e5b41b6222df3e6b4c16a44f3ef2939b7.tar.gz | |
Merge with MariaDB 5.1.49
Removed references to HA_END_SPACE_KEY (which has been 0 for a long time)
Diffstat (limited to 'include/m_string.h')
| -rw-r--r-- | include/m_string.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/m_string.h b/include/m_string.h index dc7b7c414c5..31719781a48 100644 --- a/include/m_string.h +++ b/include/m_string.h @@ -124,9 +124,6 @@ extern size_t bcmp(const uchar *s1,const uchar *s2,size_t len); extern size_t my_bcmp(const uchar *s1,const uchar *s2,size_t len); #undef bcmp #define bcmp(A,B,C) my_bcmp((A),(B),(C)) -#define bzero_if_valgrind(A,B) bzero(A,B) -#else -#define bzero_if_valgrind(A,B) #endif /* HAVE_valgrind */ #if defined(_lint) || defined(FORCE_INIT_OF_VARS) |