From aa08887f7b724d8fc07d2d807d4b0b364ac937a7 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 18 Mar 2003 11:17:48 +0200 Subject: Fixes to avoid errors from valgrind Fixed problem with 'wrong packet number' in union include/my_global.h: Fix for valgrind mysql-test/t/rpl_rotate_logs.test: Fix to avoid timeing problem sql/item.h: Indentation change sql/set_var.cc: Fix to avoid reference to uninitialized memory sql/sql_select.cc: More DBUG_PRINT messages Fixed problem with 'wrong packet number' in union (tmp_join.error was not correctly reset) sql/sql_union.cc: Simple code cleanup strings/ctype-simple.c: Fix for valgrind --- include/my_global.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'include/my_global.h') 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) +\ -- cgit v1.2.1