diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-03-28 01:04:46 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-03-28 01:04:46 +0200 |
| commit | 20e706689df1eb87c696304797e9d6184c0a75bb (patch) | |
| tree | ff3eab8fa3e060b34687c6e9819cb559ac67d5c5 /include/m_string.h | |
| parent | 3d0775e9af2fcf3fe92b7f19e299ea23068eca1e (diff) | |
| parent | bfaebe3f5e4b917c4498e234bad7a9d45d07ca62 (diff) | |
| download | mariadb-git-20e706689df1eb87c696304797e9d6184c0a75bb.tar.gz | |
mysql-5.5.22 merge
mysql-test/suite/innodb/t/group_commit_crash.test:
remove autoincrement to avoid rbr being used for insert ... select
mysql-test/suite/innodb/t/group_commit_crash_no_optimize_thread.test:
remove autoincrement to avoid rbr being used for insert ... select
mysys/my_addr_resolve.c:
a pointer to a buffer is returned to the caller -> the buffer cannot be on the stack
mysys/stacktrace.c:
my_vsnprintf() is ok here, in 5.5
Diffstat (limited to 'include/m_string.h')
| -rw-r--r-- | include/m_string.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/m_string.h b/include/m_string.h index 7c95c7319dc..9fc6cda4764 100644 --- a/include/m_string.h +++ b/include/m_string.h @@ -66,7 +66,9 @@ # define bcmp(A,B,C) memcmp((A),(B),(C)) #endif -#if !defined(bzero) && (!defined(HAVE_BZERO) || !defined(HAVE_DECL_BZERO)) +#if !defined(bzero) && (!defined(HAVE_BZERO) || !HAVE_DECL_BZERO || defined(_AIX)) +/* See autoconf doku: "HAVE_DECL_symbol" will be defined after configure, to 0 or 1 */ +/* AIX has bzero() as a function, but the declaration prototype is strangely hidden */ # define bzero(A,B) memset((A),0,(B)) #endif |