diff options
author | Michael Widenius <monty@askmonty.org> | 2010-08-02 12:01:24 +0300 |
---|---|---|
committer | Michael Widenius <monty@askmonty.org> | 2010-08-02 12:01:24 +0300 |
commit | e0a6b02c5d0a311e7167295494786077009743d1 (patch) | |
tree | 72c934fe42261ad5de3139961e092f57e9d147df /include/m_string.h | |
parent | d2f8b7d04503478ab6b6998194a2070891f0c2bb (diff) | |
parent | 6ad06b15222300e4eed4fe3972d1ad249c4c42a2 (diff) | |
download | mariadb-git-e0a6b02c5d0a311e7167295494786077009743d1.tar.gz |
Merge with MySQL 5.1.49
Fixed Bug#52005 'JOIN_TAB->dependent' may be incorrectly propageted for multilevel outer joins' in a better way (patch from Sergey Petrunya)
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 a86a2d66135..6af7c7f9fa2 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) |