diff options
| author | monty@narttu.mysql.fi <> | 2003-08-20 16:25:44 +0300 |
|---|---|---|
| committer | monty@narttu.mysql.fi <> | 2003-08-20 16:25:44 +0300 |
| commit | 359846f052f660af465cffe6480433a400da90de (patch) | |
| tree | 4d61f552796b268be72317d81fd6051dd59c7966 /include/m_string.h | |
| parent | 4877e908db7e4cb6aed4d6246e654732e86158dd (diff) | |
| download | mariadb-git-359846f052f660af465cffe6480433a400da90de.tar.gz | |
Fixed some varnings from valgrind
Set min value of max_allowed_packet to 1024
Fixed problem with UNION's without braces and SQL_CALC_FOUND_ROWS, LIMIT #,#
and ORDER BY...LIMIT
Diffstat (limited to 'include/m_string.h')
| -rw-r--r-- | include/m_string.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/include/m_string.h b/include/m_string.h index c6943613b1a..eae0e8f3f94 100644 --- a/include/m_string.h +++ b/include/m_string.h @@ -119,6 +119,18 @@ extern void bmove_allign(gptr dst,const gptr src,uint len); #define bmove512(A,B,C) memcpy(A,B,C) #endif +#ifdef HAVE_purify +#include <assert.h> +#define memcpy_overlap(A,B,C) \ +DBUG_ASSERT((A) == (B) || ((A)+(C)) <= (B) || ((B)+(C)) <= (A)); \ +bmove((byte*) key,(byte*) from,(size_t) length); +#else +#define memcpy_overlap(A,B,C) \ +DBUG_ASSERT((A) == (B) || ((A)+(C)) <= (B) || ((B)+(C)) <= (A)); \ +memcpy((A), (B), (C)) +#endif /* HAVE_purify */ + + /* Prototypes for string functions */ #if !defined(bfill) && !defined(HAVE_BFILL) |