diff options
| author | monty@narttu.mysql.fi <> | 2003-03-18 11:17:48 +0200 |
|---|---|---|
| committer | monty@narttu.mysql.fi <> | 2003-03-18 11:17:48 +0200 |
| commit | a916a03916eda128d3305e58cc49cf84e73deae6 (patch) | |
| tree | a7bad6bcbb23f23c615a80983400f8c52ae5b2f3 /include | |
| parent | 5dd970c335d61ac5bf594e9b4a2b508829115631 (diff) | |
| download | mariadb-git-a916a03916eda128d3305e58cc49cf84e73deae6.tar.gz | |
Fixes to avoid errors from valgrind
Fixed problem with 'wrong packet number' in union
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_global.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/my_global.h b/include/my_global.h index 64bfefa16f3..30785d6a9b6 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -870,7 +870,13 @@ typedef char bool; /* Ordinary boolean values 0 1 */ ((uint32) (uchar) (A)[0]))) #define sint4korr(A) (*((long *) (A))) #define uint2korr(A) (*((uint16 *) (A))) +#ifdef HAVE_purify +#define uint3korr(A) (uint32) (((uint32) ((uchar) (A)[0])) +\ + (((uint32) ((uchar) (A)[1])) << 8) +\ + (((uint32) ((uchar) (A)[2])) << 16)) +#else #define uint3korr(A) (long) (*((unsigned long *) (A)) & 0xFFFFFF) +#endif #define uint4korr(A) (*((unsigned long *) (A))) #define uint5korr(A) ((ulonglong)(((uint32) ((uchar) (A)[0])) +\ (((uint32) ((uchar) (A)[1])) << 8) +\ |