diff options
| author | Michael Widenius <monty@mysql.com> | 2009-05-19 12:28:05 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@mysql.com> | 2009-05-19 12:28:05 +0300 |
| commit | 224108a19ec945ac1c3da6c5ec36b6777fd59444 (patch) | |
| tree | 0c9eed2ea6f66b7a2416b6a663906a7841e33deb /include | |
| parent | b94f191a776791e7a120c7e7829be4ffe8109823 (diff) | |
| parent | db020fb30f56c1ec1b1e65304ad5a0830fddab34 (diff) | |
| download | mariadb-git-224108a19ec945ac1c3da6c5ec36b6777fd59444.tar.gz | |
Fixed problems in merge
mysql-test/r/information_schema.result:
Fixed a result file.
mysql-test/r/innodb-autoinc.result:
Fixed a result file.
mysql-test/t/connect.test:
Fixed a problem with merge, needed to close
connections and use the default
Diffstat (limited to 'include')
| -rw-r--r-- | include/m_string.h | 10 | ||||
| -rw-r--r-- | include/my_global.h | 16 |
2 files changed, 13 insertions, 13 deletions
diff --git a/include/m_string.h b/include/m_string.h index 2fadd11af89..c111a93c4bc 100644 --- a/include/m_string.h +++ b/include/m_string.h @@ -108,7 +108,7 @@ extern const double log_10[309]; #define memcpy_fixed(A,B,C) memcpy((A),(B),(C)) #endif -#if (!defined(USE_BMOVE512) || defined(HAVE_purify)) && !defined(bmove512) +#if (!defined(USE_BMOVE512) || defined(HAVE_valgrind)) && !defined(bmove512) #define bmove512(A,B,C) memcpy(A,B,C) #endif @@ -125,14 +125,14 @@ extern void bzero(uchar * dst,size_t len); #if !defined(bcmp) && !defined(HAVE_BCMP) extern size_t bcmp(const uchar *s1,const uchar *s2,size_t len); #endif -#ifdef HAVE_purify +#ifdef HAVE_valgrind 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_purify(A,B) bzero(A,B) +#define bzero_if_valgrind(A,B) bzero(A,B) #else -#define bzero_if_purify(A,B) -#endif /* HAVE_purify */ +#define bzero_if_valgrind(A,B) +#endif /* HAVE_valgrind */ #if defined(_lint) || defined(FORCE_INIT_OF_VARS) #define LINT_INIT_STRUCT(var) bzero(&var, sizeof(var)) /* No uninitialize-warning */ diff --git a/include/my_global.h b/include/my_global.h index f14204cf215..b350ece971b 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -566,16 +566,16 @@ int __void__; #define LINT_INIT(var) #endif -#if defined(_lint) || defined(FORCE_INIT_OF_VARS) || defined(HAVE_purify) -#define PURIFY_OR_LINT_INIT(var) var=0 +#if defined(_lint) || defined(FORCE_INIT_OF_VARS) || defined(HAVE_valgrind) +#define VALGRIND_OR_LINT_INIT(var) var=0 #else -#define PURIFY_OR_LINT_INIT(var) +#define VALGRIND_OR_LINT_INIT(var) #endif -#ifdef HAVE_purify -#define IF_PURIFY(A,B) (A) +#ifdef HAVE_valgrind +#define IF_VALGRIND(A,B) (A) #else -#define IF_PURIFY(A,B) (B) +#define IF_VALGRIND(A,B) (B) #endif #if !defined(HAVE_UINT) @@ -1206,7 +1206,7 @@ typedef char bool; /* Ordinary boolean values 0 1 */ ((uint32) (uchar) (A)[0]))) #define sint4korr(A) (*((const long *) (A))) #define uint2korr(A) (*((const uint16 *) (A))) -#if defined(HAVE_purify) && !defined(_WIN32) +#if defined(HAVE_valgrind) && !defined(_WIN32) #define uint3korr(A) (uint32) (((uint32) ((uchar) (A)[0])) +\ (((uint32) ((uchar) (A)[1])) << 8) +\ (((uint32) ((uchar) (A)[2])) << 16)) @@ -1218,7 +1218,7 @@ typedef char bool; /* Ordinary boolean values 0 1 */ It means, that you have to provide enough allocated space ! */ #define uint3korr(A) (long) (*((const unsigned int *) (A)) & 0xFFFFFF) -#endif /* HAVE_purify && !_WIN32 */ +#endif /* HAVE_valgrind && !_WIN32 */ #define uint4korr(A) (*((const uint32 *) (A))) #define uint5korr(A) ((ulonglong)(((uint32) ((uchar) (A)[0])) +\ (((uint32) ((uchar) (A)[1])) << 8) +\ |