diff options
59 files changed, 115 insertions, 119 deletions
diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh index 12f80c40e9f..b63841aef2d 100755 --- a/BUILD/SETUP.sh +++ b/BUILD/SETUP.sh @@ -119,7 +119,7 @@ fi # Set flags for various build configurations. # Used in -valgrind builds -valgrind_flags="-USAFEMALLOC -UFORCE_INIT_OF_VARS -DHAVE_purify " +valgrind_flags="-USAFEMALLOC -UFORCE_INIT_OF_VARS -DHAVE_valgrind " valgrind_flags="$valgrind_flags -DMYSQL_SERVER_SUFFIX=-valgrind-max" # # Used in -debug builds diff --git a/BUILD/build_mccge.sh b/BUILD/build_mccge.sh index fc0f8181692..bf0596239cd 100755 --- a/BUILD/build_mccge.sh +++ b/BUILD/build_mccge.sh @@ -938,7 +938,7 @@ set_up_ccache() set_valgrind_flags() { if test "x$valgrind_flag" = "xyes" ; then - loc_valgrind_flags="-USAFEMALLOC -UFORCE_INIT_OF_VARS -DHAVE_purify " + loc_valgrind_flags="-USAFEMALLOC -UFORCE_INIT_OF_VARS -DHAVE_valgrind " loc_valgrind_flags="$loc_valgrind_flags -DMYSQL_SERVER_SUFFIX=-valgrind-max" compiler_flags="$compiler_flags $loc_valgrind_flags" fi diff --git a/BUILD/compile-dist b/BUILD/compile-dist index e7bfb97be41..d8b939dc0fc 100755 --- a/BUILD/compile-dist +++ b/BUILD/compile-dist @@ -60,8 +60,6 @@ fi # Make sure to enable all features that affect "make dist" # Remember that configure restricts the man pages to the configured features ! ./configure \ - --with-maria-storage-engine \ - --with-embedded-server \ - --with-ndbcluster -$gmake - + --with-plugins=max-no-ndb \ + --with-embedded-server +$gmake -j4 diff --git a/BUILD/compile-pentium64-max b/BUILD/compile-pentium64-max index 9acd5e7c460..e6695f292e4 100755 --- a/BUILD/compile-pentium64-max +++ b/BUILD/compile-pentium64-max @@ -4,7 +4,10 @@ path=`dirname $0` . "$path/SETUP.sh" extra_flags="$pentium64_cflags $fast_cflags" -extra_configs="$pentium_configs $max_configs $static_link" +# On CentOS/Fedora Core 10 amd64, there is system libz.so but not +# libz.a, so need to use bundled zlib when building static +# binary. Hence we use --with-zlib-dir=bundled +extra_configs="$pentium_configs $max_configs $static_link --with-zlib-dir=bundled" CC="$CC --pipe" strip=yes diff --git a/BUILD/compile-solaris-sparc-purify b/BUILD/compile-solaris-sparc-purify index 08308f05f4e..989587fbe99 100755 --- a/BUILD/compile-solaris-sparc-purify +++ b/BUILD/compile-solaris-sparc-purify @@ -37,7 +37,7 @@ make -k maintainer-clean || true path=`dirname $0` . "$path/autorun.sh" -CFLAGS="-g -Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wimplicit-int -Wparentheses -Wsign-compare -Wwrite-strings -Wunused -DHAVE_purify -DEXTRA_DEBUG -O2" CXX=gcc CXXLD=g++ CXXFLAGS="-g -Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor -felide-constructors -fno-exceptions -fno-rtti -DHAVE_purify -DEXTRA_DEBUG -O2" ./configure --prefix=/usr/local/mysql --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client --with-embedded-server --with-innodb $EXTRA_CONFIG_FLAGS +CFLAGS="-g -Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wimplicit-int -Wparentheses -Wsign-compare -Wwrite-strings -Wunused -DHAVE_valgrind -DEXTRA_DEBUG -O2" CXX=gcc CXXLD=g++ CXXFLAGS="-g -Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor -felide-constructors -fno-exceptions -fno-rtti -DHAVE_valgrind -DEXTRA_DEBUG -O2" ./configure --prefix=/usr/local/mysql --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client --with-embedded-server --with-innodb $EXTRA_CONFIG_FLAGS make -j 4 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 37bcab244ff..ebf2673c71e 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -563,16 +563,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) @@ -1174,7 +1174,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)) @@ -1186,7 +1186,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) +\ diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am index 9e38a32cd00..3718dc6b27f 100644 --- a/mysql-test/Makefile.am +++ b/mysql-test/Makefile.am @@ -98,7 +98,8 @@ TEST_DIRS = t r include std_data std_data/parts \ suite/stress/include suite/stress/t suite/stress/r \ suite/ndb suite/ndb/t suite/ndb/r \ suite/rpl_ndb suite/rpl_ndb/t suite/rpl_ndb/r \ - suite/parts suite/parts/t suite/parts/r suite/parts/inc + suite/parts suite/parts/t suite/parts/r suite/parts/inc \ + suite/pbxt/t suite/pbxt/r # Used by dist-hook and install-data-local to copy all # test files into either dist or install directory diff --git a/mysql-test/lib/mtr_unique.pm b/mysql-test/lib/mtr_unique.pm index 49d1598a562..59b12abdd85 100644 --- a/mysql-test/lib/mtr_unique.pm +++ b/mysql-test/lib/mtr_unique.pm @@ -62,14 +62,14 @@ sub mtr_get_unique_id($$) { die 'lock file is a symbolic link'; } + my $save_umask= umask(0); open SEM, ">", "$file.sem" or die "can't write to $file.sem"; - chmod 0777, "$file.sem"; flock SEM, LOCK_EX or die "can't lock $file.sem"; if(! -e $file) { open FILE, ">", $file or die "can't create $file"; close FILE; } - chmod 0777, $file; + umask($save_umask); msg("HAVE THE LOCK"); @@ -135,8 +135,8 @@ sub mtr_release_unique_id($) { die 'lock file is a symbolic link'; } + my $save_umask= umask(0); open SEM, ">", "$file.sem" or die "can't write to $file.sem"; - chmod 0777, "$file.sem"; flock SEM, LOCK_EX or die "can't lock $file.sem"; msg("HAVE THE LOCK"); @@ -149,7 +149,7 @@ sub mtr_release_unique_id($) { open FILE, ">", $file or die "can't create $file"; close FILE; } - chmod 0777, "$file.sem"; + umask($save_umask); open FILE, "+<", $file or die "can't open $file"; #select undef,undef,undef,0.2; seek FILE, 0, 0; diff --git a/mysql-test/t/pool_of_threads.cnf b/mysql-test/t/pool_of_threads.cnf index 4ad94ab69d9..b96953ad1c5 100644 --- a/mysql-test/t/pool_of_threads.cnf +++ b/mysql-test/t/pool_of_threads.cnf @@ -2,8 +2,8 @@ [mysqld.1] test-ignore-wrong-options -thread-handling= pool-of-threads -thread_pool_size= 2 +loose-thread-handling= pool-of-threads +loose-thread_pool_size= 2 extra-port= @mysqld.1.#extra-port extra-max-connections=1 diff --git a/mysys/mf_qsort.c b/mysys/mf_qsort.c index 4b3ecb603a6..9e1ee2782a4 100644 --- a/mysys/mf_qsort.c +++ b/mysys/mf_qsort.c @@ -108,7 +108,7 @@ qsort_t my_qsort(void *base_ptr, size_t count, size_t size, qsort_cmp cmp) low = (char*) base_ptr; high = low+ size * (count - 1); stack_ptr = stack + 1; -#ifdef HAVE_purify +#ifdef HAVE_valgrind /* The first element in the stack will be accessed for the last POP */ stack[0].low=stack[0].high=0; #endif diff --git a/mysys/my_alloc.c b/mysys/my_alloc.c index 2607ea57d08..32fc75fc692 100644 --- a/mysys/my_alloc.c +++ b/mysys/my_alloc.c @@ -56,7 +56,7 @@ void init_alloc_root(MEM_ROOT *mem_root, size_t block_size, mem_root->block_num= 4; /* We shift this with >>2 */ mem_root->first_block_usage= 0; -#if !(defined(HAVE_purify) && defined(EXTRA_DEBUG)) +#if !(defined(HAVE_valgrind) && defined(EXTRA_DEBUG)) if (pre_alloc_size) { if ((mem_root->free= mem_root->pre_alloc= @@ -96,7 +96,7 @@ void reset_root_defaults(MEM_ROOT *mem_root, size_t block_size, DBUG_ASSERT(alloc_root_inited(mem_root)); mem_root->block_size= block_size - ALLOC_ROOT_MIN_BLOCK_SIZE; -#if !(defined(HAVE_purify) && defined(EXTRA_DEBUG)) +#if !(defined(HAVE_valgrind) && defined(EXTRA_DEBUG)) if (pre_alloc_size) { size_t size= pre_alloc_size + ALIGN_SIZE(sizeof(USED_MEM)); @@ -147,7 +147,7 @@ void reset_root_defaults(MEM_ROOT *mem_root, size_t block_size, void *alloc_root(MEM_ROOT *mem_root, size_t length) { -#if defined(HAVE_purify) && defined(EXTRA_DEBUG) +#if defined(HAVE_valgrind) && defined(EXTRA_DEBUG) reg1 USED_MEM *next; DBUG_ENTER("alloc_root"); DBUG_PRINT("enter",("root: 0x%lx", (long) mem_root)); diff --git a/mysys/my_init.c b/mysys/my_init.c index 0560d64d9d8..4a658da6d58 100644 --- a/mysys/my_init.c +++ b/mysys/my_init.c @@ -170,7 +170,7 @@ void my_end(int infoflag) { #ifdef HAVE_GETRUSAGE struct rusage rus; -#ifdef HAVE_purify +#ifdef HAVE_valgrind /* Purify assumes that rus is uninitialized after getrusage call */ bzero((char*) &rus, sizeof(rus)); #endif diff --git a/mysys/my_rnd.c b/mysys/my_rnd.c index b7dca0f2afd..178bcd9c539 100644 --- a/mysys/my_rnd.c +++ b/mysys/my_rnd.c @@ -26,7 +26,7 @@ void my_rnd_init(struct my_rnd_struct *rand_st, ulong seed1, ulong seed2) { -#ifdef HAVE_purify +#ifdef HAVE_valgrind bzero((char*) rand_st,sizeof(*rand_st)); /* Avoid UMC varnings */ #endif rand_st->max_value= 0x3FFFFFFFL; diff --git a/mysys/safemalloc.c b/mysys/safemalloc.c index 59bc4e73af7..ae8bf45b807 100644 --- a/mysys/safemalloc.c +++ b/mysys/safemalloc.c @@ -304,7 +304,7 @@ void _myfree(void *ptr, const char *filename, uint lineno, myf myflags) sf_malloc_count--; pthread_mutex_unlock(&THR_LOCK_malloc); -#ifndef HAVE_purify +#ifndef HAVE_valgrind /* Mark this data as free'ed */ if (!sf_malloc_quick) bfill(ptr, irem->datasize, (pchar) FREE_VAL); diff --git a/scripts/mysql_config.pl.in b/scripts/mysql_config.pl.in index 21896711fa8..d8a6cce2664 100644 --- a/scripts/mysql_config.pl.in +++ b/scripts/mysql_config.pl.in @@ -44,7 +44,7 @@ use strict; my @exclude_cflags = qw/DDBUG_OFF DSAFEMALLOC USAFEMALLOC DSAFE_MUTEX DPEDANTIC_SAFEMALLOC DUNIV_MUST_NOT_INLINE DFORCE_INIT_OF_VARS - DEXTRA_DEBUG DHAVE_purify O O[0-9] xO[0-9] W[-A-Za-z]* + DEXTRA_DEBUG DHAVE_valgrind O O[0-9] xO[0-9] W[-A-Za-z]* Xa xstrconst xc99=none unroll2 ip mp restrict/; diff --git a/scripts/mysql_config.sh b/scripts/mysql_config.sh index efc82544bc0..e294dc546a8 100644 --- a/scripts/mysql_config.sh +++ b/scripts/mysql_config.sh @@ -129,7 +129,7 @@ include="-I$pkgincludedir" # to make --cflags usable for HP C++ (aCC) for remove in DDBUG_OFF DSAFEMALLOC USAFEMALLOC DSAFE_MUTEX \ DPEDANTIC_SAFEMALLOC DUNIV_MUST_NOT_INLINE DFORCE_INIT_OF_VARS \ - DEXTRA_DEBUG DHAVE_purify O 'O[0-9]' 'xO[0-9]' 'W[-A-Za-z]*' \ + DEXTRA_DEBUG DHAVE_valgrind O 'O[0-9]' 'xO[0-9]' 'W[-A-Za-z]*' \ 'mtune=[-A-Za-z0-9]*' 'mcpu=[-A-Za-z0-9]*' 'march=[-A-Za-z0-9]*' \ Xa xstrconst "xc99=none" AC99 \ unroll2 ip mp restrict diff --git a/sql/field_conv.cc b/sql/field_conv.cc index ae690594718..9a53f258754 100644 --- a/sql/field_conv.cc +++ b/sql/field_conv.cc @@ -773,7 +773,7 @@ int field_conv(Field *to,Field *from) ((Field_varstring*)from)->length_bytes == ((Field_varstring*)to)->length_bytes)) { // Identical fields -#ifdef HAVE_purify +#ifdef HAVE_valgrind /* This may happen if one does 'UPDATE ... SET x=x' */ if (to->ptr != from->ptr) #endif diff --git a/sql/filesort.cc b/sql/filesort.cc index dc59f1c8fcd..f5fe17e6ff1 100644 --- a/sql/filesort.cc +++ b/sql/filesort.cc @@ -953,13 +953,13 @@ static void make_sortkey(register SORTPARAM *param, if (addonf->null_bit && field->is_null()) { nulls[addonf->null_offset]|= addonf->null_bit; -#ifdef HAVE_purify +#ifdef HAVE_valgrind bzero(to, addonf->length); #endif } else { -#ifdef HAVE_purify +#ifdef HAVE_valgrind uchar *end= field->pack(to, field->ptr); uint length= (uint) ((to + addonf->length) - end); DBUG_ASSERT((int) length >= 0); diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc index 40c363f0182..c3bfb04217b 100644 --- a/sql/ha_partition.cc +++ b/sql/ha_partition.cc @@ -3548,10 +3548,10 @@ void ha_partition::position(const uchar *record) (ref_length - PARTITION_BYTES_IN_POS)); #ifdef SUPPORTING_PARTITION_OVER_DIFFERENT_ENGINES -#ifdef HAVE_purify +#ifdef HAVE_valgrind bzero(ref + PARTITION_BYTES_IN_POS + ref_length, max_ref_length-ref_length); -#endif /* HAVE_purify */ +#endif /* HAVE_valgrind */ #endif DBUG_VOID_RETURN; } diff --git a/sql/hostname.cc b/sql/hostname.cc index c8cf46383a9..ec090cbe02f 100644 --- a/sql/hostname.cc +++ b/sql/hostname.cc @@ -175,7 +175,7 @@ char * ip_to_hostname(struct in_addr *in, uint *errors) char buff[GETHOSTBYADDR_BUFF_SIZE],buff2[GETHOSTBYNAME_BUFF_SIZE]; int tmp_errno; struct hostent tmp_hostent, tmp_hostent2; -#ifdef HAVE_purify +#ifdef HAVE_valgrind bzero(buff,sizeof(buff)); // Bug in purify #endif if (!(hp=gethostbyaddr_r((char*) in,sizeof(*in), diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc index deffb0d56ca..26175b828ce 100644 --- a/sql/item_timefunc.cc +++ b/sql/item_timefunc.cc @@ -290,8 +290,8 @@ static bool extract_date_time(DATE_TIME_FORMAT *format, LINT_INIT(strict_week_number); /* Remove valgrind varnings when using gcc 3.3 and -O1 */ - PURIFY_OR_LINT_INIT(strict_week_number_year_type); - PURIFY_OR_LINT_INIT(sunday_first_n_first_week_non_iso); + VALGRIND_OR_LINT_INIT(strict_week_number_year_type); + VALGRIND_OR_LINT_INIT(sunday_first_n_first_week_non_iso); if (!sub_pattern_end) bzero((char*) l_time, sizeof(*l_time)); diff --git a/sql/log_event.cc b/sql/log_event.cc index 4dea2e5e62c..a0eb8454a2f 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -6990,7 +6990,7 @@ int Rows_log_event::do_add_row_data(uchar *row_data, size_t length) Don't print debug messages when running valgrind since they can trigger false warnings. */ -#ifndef HAVE_purify +#ifndef HAVE_valgrind DBUG_DUMP("row_data", row_data, min(length, 32)); #endif @@ -7771,7 +7771,7 @@ Table_map_log_event::Table_map_log_event(const char *buf, uint event_len, Don't print debug messages when running valgrind since they can trigger false warnings. */ -#ifndef HAVE_purify +#ifndef HAVE_valgrind DBUG_DUMP("event buffer", (uchar*) buf, event_len); #endif @@ -8674,7 +8674,7 @@ int Rows_log_event::find_row(const Relay_log_info *rli) Don't print debug messages when running valgrind since they can trigger false warnings. */ -#ifndef HAVE_purify +#ifndef HAVE_valgrind DBUG_DUMP("key data", m_key, table->key_info->key_length); #endif @@ -8704,7 +8704,7 @@ int Rows_log_event::find_row(const Relay_log_info *rli) Don't print debug messages when running valgrind since they can trigger false warnings. */ -#ifndef HAVE_purify +#ifndef HAVE_valgrind DBUG_PRINT("info",("found first matching record")); DBUG_DUMP("record[0]", table->record[0], table->s->reclength); #endif @@ -9067,7 +9067,7 @@ Update_rows_log_event::do_exec_row(const Relay_log_info *const rli) Now we have the right row to update. The old row (the one we're looking for) is in record[1] and the new row is in record[0]. */ -#ifndef HAVE_purify +#ifndef HAVE_valgrind /* Don't print debug messages when running valgrind since they can trigger false warnings. diff --git a/sql/log_event_old.cc b/sql/log_event_old.cc index cc4d24bc2dd..88faf87c6af 100644 --- a/sql/log_event_old.cc +++ b/sql/log_event_old.cc @@ -724,7 +724,7 @@ static int find_and_fetch_row(TABLE *table, uchar *key) Don't print debug messages when running valgrind since they can trigger false warnings. */ -#ifndef HAVE_purify +#ifndef HAVE_valgrind DBUG_DUMP("table->record[0]", table->record[0], table->s->reclength); DBUG_DUMP("table->record[1]", table->record[1], table->s->reclength); #endif @@ -750,7 +750,7 @@ static int find_and_fetch_row(TABLE *table, uchar *key) Don't print debug messages when running valgrind since they can trigger false warnings. */ -#ifndef HAVE_purify +#ifndef HAVE_valgrind DBUG_DUMP("table->record[0]", table->record[0], table->s->reclength); DBUG_DUMP("table->record[1]", table->record[1], table->s->reclength); #endif @@ -1404,7 +1404,7 @@ int Old_rows_log_event::do_add_row_data(uchar *row_data, size_t length) Don't print debug messages when running valgrind since they can trigger false warnings. */ -#ifndef HAVE_purify +#ifndef HAVE_valgrind DBUG_DUMP("row_data", row_data, min(length, 32)); #endif @@ -2353,7 +2353,7 @@ int Old_rows_log_event::find_row(const Relay_log_info *rli) Don't print debug messages when running valgrind since they can trigger false warnings. */ -#ifndef HAVE_purify +#ifndef HAVE_valgrind DBUG_DUMP("key data", m_key, table->key_info->key_length); #endif @@ -2383,7 +2383,7 @@ int Old_rows_log_event::find_row(const Relay_log_info *rli) Don't print debug messages when running valgrind since they can trigger false warnings. */ -#ifndef HAVE_purify +#ifndef HAVE_valgrind DBUG_PRINT("info",("found first matching record")); DBUG_DUMP("record[0]", table->record[0], table->s->reclength); #endif @@ -2878,7 +2878,7 @@ Update_rows_log_event_old::do_exec_row(const Relay_log_info *const rli) Now we have the right row to update. The old row (the one we're looking for) is in record[1] and the new row is in record[0]. */ -#ifndef HAVE_purify +#ifndef HAVE_valgrind /* Don't print debug messages when running valgrind since they can trigger false warnings. diff --git a/sql/my_decimal.h b/sql/my_decimal.h index 0e79f70ab4e..ae081ce5617 100644 --- a/sql/my_decimal.h +++ b/sql/my_decimal.h @@ -99,7 +99,7 @@ public: { len= DECIMAL_BUFF_LENGTH; buf= buffer; -#if !defined (HAVE_purify) && !defined(DBUG_OFF) +#if !defined (HAVE_valgrind) && !defined(DBUG_OFF) /* Set buffer to 'random' value to find wrong buffer usage */ for (uint i= 0; i < DECIMAL_BUFF_LENGTH; i++) buffer[i]= i; diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 7a988f1cbad..85082746859 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -57,12 +57,6 @@ #define mysqld_charset &my_charset_latin1 -#ifdef HAVE_purify -#define IF_PURIFY(A,B) (A) -#else -#define IF_PURIFY(A,B) (B) -#endif - #if SIZEOF_CHARP == 4 #define MAX_MEM_TABLE_SIZE ~(ulong) 0 #else @@ -76,9 +70,9 @@ char pstack_file_name[80]; #endif /* __linux__ */ -/* We have HAVE_purify below as this speeds up the shutdown of MySQL */ +/* We have HAVE_valgrind below as this speeds up the shutdown of MySQL */ -#if defined(HAVE_DEC_3_2_THREADS) || defined(SIGNALS_DONT_BREAK_READ) || defined(HAVE_purify) && defined(__linux__) +#if defined(HAVE_DEC_3_2_THREADS) || defined(SIGNALS_DONT_BREAK_READ) || defined(HAVE_valgrind) && defined(__linux__) #define HAVE_CLOSE_SERVER_SOCK 1 #endif @@ -6520,7 +6514,7 @@ log and this option does nothing anymore.", purify. These are not suppressed: instead we disable symlinks option if compiled with valgrind support. */ - IF_PURIFY(0,1), 0, 0, 0, 0, 0}, + IF_VALGRIND(0,1), 0, 0, 0, 0, 0}, {"sysdate-is-now", OPT_SYSDATE_IS_NOW, "Non-default option to alias SYSDATE() to NOW() to make it safe-replicable. Since 5.0, SYSDATE() returns a `dynamic' value different for different invocations, even within the same statement.", (uchar**) &global_system_variables.sysdate_is_now, @@ -6561,7 +6555,7 @@ log and this option does nothing anymore.", 0, 0, 0, 0, 0}, {"use-symbolic-links", 's', "Enable symbolic link support. Deprecated option; use --symbolic-links instead.", (uchar**) &my_use_symdir, (uchar**) &my_use_symdir, 0, GET_BOOL, NO_ARG, - IF_PURIFY(0,1), 0, 0, 0, 0, 0}, + IF_VALGRIND(0,1), 0, 0, 0, 0, 0}, {"user", 'u', "Run mysqld daemon as user.", 0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, {"verbose", 'v', "Used with --help option for detailed help", @@ -7661,7 +7655,7 @@ static int mysql_init_variables(void) /* Things reset to zero */ opt_skip_slave_start= opt_reckless_slave = 0; mysql_home[0]= pidfile_name[0]= log_error_file[0]= 0; -#if defined(HAVE_REALPATH) && !defined(HAVE_purify) && !defined(HAVE_BROKEN_REALPATH) +#if defined(HAVE_REALPATH) && !defined(HAVE_valgrind) && !defined(HAVE_BROKEN_REALPATH) /* We can only test for sub paths if my_symlink.c is using realpath */ myisam_test_invalid_symlink= test_if_data_home_dir; #endif diff --git a/sql/opt_range.cc b/sql/opt_range.cc index 37cc0b1ee7b..817fbe715e5 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -8347,7 +8347,7 @@ int QUICK_RANGE_SELECT::reset() multi_range_buff->buffer= mrange_buff; multi_range_buff->buffer_end= mrange_buff + mrange_bufsiz; multi_range_buff->end_of_used_area= mrange_buff; -#ifdef HAVE_purify +#ifdef HAVE_valgrind /* We need this until ndb will use the buffer efficiently (Now ndb stores complete row in here, instead of only the used fields diff --git a/sql/opt_range.h b/sql/opt_range.h index 8d2ba1bb0a6..225af276e55 100644 --- a/sql/opt_range.h +++ b/sql/opt_range.h @@ -44,7 +44,7 @@ class QUICK_RANGE :public Sql_alloc { uint16 min_length,max_length,flag; key_part_map min_keypart_map, // bitmap of used keyparts in min_key max_keypart_map; // bitmap of used keyparts in max_key -#ifdef HAVE_purify +#ifdef HAVE_valgrind uint16 dummy; /* Avoid warnings on 'flag' */ #endif QUICK_RANGE(); /* Full range */ @@ -61,7 +61,7 @@ class QUICK_RANGE :public Sql_alloc { min_keypart_map(min_keypart_map_arg), max_keypart_map(max_keypart_map_arg) { -#ifdef HAVE_purify +#ifdef HAVE_valgrind dummy=0; #endif } diff --git a/sql/records.cc b/sql/records.cc index 9e040de3fda..8bab6fd46a4 100644 --- a/sql/records.cc +++ b/sql/records.cc @@ -520,7 +520,7 @@ static int init_rr_cache(THD *thd, READ_RECORD *info) info->struct_length+1, MYF(0)))) DBUG_RETURN(1); -#ifdef HAVE_purify +#ifdef HAVE_valgrind // Avoid warnings in qsort bzero(info->cache,rec_cache_size+info->cache_records* info->struct_length+1); #endif diff --git a/sql/rpl_rli.cc b/sql/rpl_rli.cc index fe8e17dc1c7..aa11f3bfbfc 100644 --- a/sql/rpl_rli.cc +++ b/sql/rpl_rli.cc @@ -34,7 +34,7 @@ Relay_log_info::Relay_log_info() no_storage(FALSE), replicate_same_server_id(::replicate_same_server_id), info_fd(-1), cur_log_fd(-1), save_temporary_tables(0), cur_log_old_open_count(0), group_relay_log_pos(0), event_relay_log_pos(0), -#if HAVE_purify +#if HAVE_valgrind is_fake(FALSE), #endif group_master_log_pos(0), log_space_total(0), ignore_log_space_limit(0), diff --git a/sql/rpl_rli.h b/sql/rpl_rli.h index e13ea93842c..4b828b4da5b 100644 --- a/sql/rpl_rli.h +++ b/sql/rpl_rli.h @@ -154,7 +154,7 @@ public: ulonglong event_relay_log_pos; ulonglong future_event_relay_log_pos; -#ifdef HAVE_purify +#ifdef HAVE_valgrind bool is_fake; /* Mark that this is a fake relay log info structure */ #endif diff --git a/sql/set_var.cc b/sql/set_var.cc index c6650702cf9..647cb8b4eac 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -642,8 +642,8 @@ static sys_var_long_ptr sys_table_lock_wait_timeout(&vars, "table_lock_wait_time static sys_var_long_ptr sys_thread_cache_size(&vars, "thread_cache_size", &thread_cache_size); #if HAVE_POOL_OF_THREADS == 1 -sys_var_long_ptr sys_thread_pool_size(&vars, "thread_pool_size", - &thread_pool_size); +static sys_var_long_ptr sys_thread_pool_size(&vars, "thread_pool_size", + &thread_pool_size); #endif static sys_var_thd_enum sys_tx_isolation(&vars, "tx_isolation", &SV::tx_isolation, diff --git a/sql/slave.cc b/sql/slave.cc index 6d48e57d298..84c7e39503c 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -2014,7 +2014,7 @@ int apply_event_and_update_pos(Log_event* ev, THD* thd, Relay_log_info* rli, if (exec_res == 0) { int error= ev->update_pos(rli); -#ifdef HAVE_purify +#ifdef HAVE_valgrind if (!rli->is_fake) #endif { diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 1f086683aa2..8749066b9ba 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -3000,7 +3000,7 @@ TABLE *open_table(THD *thd, TABLE_LIST *table_list, MEM_ROOT *mem_root, table->pos_in_table_list= table_list; table_list->updatable= 1; // It is not derived table nor non-updatable VIEW table->clear_column_bitmaps(); -#if !defined(DBUG_OFF) && !defined(HAVE_purify) +#if !defined(DBUG_OFF) && !defined(HAVE_valgrind) /* Fill record with random values to find bugs where we access fields without first reading them. @@ -7363,7 +7363,7 @@ int setup_wild(THD *thd, TABLE_LIST *tables, List<Item> &fields, /* make * substituting permanent */ SELECT_LEX *select_lex= thd->lex->current_select; select_lex->with_wild= 0; -#ifdef HAVE_purify +#ifdef HAVE_valgrind if (&select_lex->item_list != &fields) // Avoid warning #endif select_lex->item_list= fields; diff --git a/sql/sql_binlog.cc b/sql/sql_binlog.cc index 96e99b57e3c..67f2912fe7b 100644 --- a/sql/sql_binlog.cc +++ b/sql/sql_binlog.cc @@ -59,7 +59,7 @@ void mysql_client_binlog_statement(THD* thd) if (!thd->rli_fake) { thd->rli_fake= new Relay_log_info; -#ifdef HAVE_purify +#ifdef HAVE_valgrind thd->rli_fake->is_fake= TRUE; #endif have_fd_event= FALSE; @@ -95,7 +95,7 @@ void mysql_client_binlog_statement(THD* thd) char const *endptr= 0; int bytes_decoded= base64_decode(strptr, coded_len, buf, &endptr); -#ifndef HAVE_purify +#ifndef HAVE_valgrind /* This debug printout should not be used for valgrind builds since it will read from unassigned memory. @@ -188,7 +188,7 @@ void mysql_client_binlog_statement(THD* thd) bufptr += event_len; DBUG_PRINT("info",("ev->get_type_code()=%d", ev->get_type_code())); -#ifndef HAVE_purify +#ifndef HAVE_valgrind /* This debug printout should not be used for valgrind builds since it will read from unassigned memory. diff --git a/sql/sql_class.cc b/sql/sql_class.cc index d2981b7b212..04b7b1e93c4 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -3480,7 +3480,7 @@ int THD::binlog_update_row(TABLE* table, bool is_trans, Don't print debug messages when running valgrind since they can trigger false warnings. */ -#ifndef HAVE_purify +#ifndef HAVE_valgrind DBUG_DUMP("before_record", before_record, table->s->reclength); DBUG_DUMP("after_record", after_record, table->s->reclength); DBUG_DUMP("before_row", before_row, before_size); diff --git a/sql/sql_list.h b/sql/sql_list.h index 0d267111dad..6edf9a00b87 100644 --- a/sql/sql_list.h +++ b/sql/sql_list.h @@ -43,7 +43,7 @@ public: static void operator delete[](void *ptr, MEM_ROOT *mem_root) { /* never called */ } static void operator delete[](void *ptr, size_t size) { TRASH(ptr, size); } -#ifdef HAVE_purify +#ifdef HAVE_valgrind bool dummy; inline Sql_alloc() :dummy(0) {} inline ~Sql_alloc() {} diff --git a/sql/sql_load.cc b/sql/sql_load.cc index 7e199266db9..026f3a240ed 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -581,7 +581,7 @@ read_fixed_length(THD *thd, COPY_INFO &info, TABLE_LIST *table_list, } it.rewind(); uchar *pos=read_info.row_start; -#ifdef HAVE_purify +#ifdef HAVE_valgrind read_info.row_end[0]=0; #endif diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 7bf44183f2d..ea6dacdb820 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -1818,7 +1818,7 @@ JOIN::exec() curr_join->having= curr_join->tmp_having= 0; // Allready done /* Change sum_fields reference to calculated fields in tmp_table */ -#ifdef HAVE_purify +#ifdef HAVE_valgrind if (curr_join != this) #endif curr_join->all_fields= *curr_all_fields; @@ -1840,7 +1840,7 @@ JOIN::exec() fields_list.elements, all_fields)) DBUG_VOID_RETURN; } -#ifdef HAVE_purify +#ifdef HAVE_valgrind if (curr_join != this) #endif { @@ -1994,7 +1994,7 @@ JOIN::exec() tmp_fields_list2, tmp_all_fields2, fields_list.elements, tmp_all_fields1)) DBUG_VOID_RETURN; -#ifdef HAVE_purify +#ifdef HAVE_valgrind /* Some GCCs use memcpy() for struct assignment, even for x=x. GCC bug 19410: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=19410 @@ -2059,7 +2059,7 @@ JOIN::exec() tmp_table_param.save_copy_field= curr_join->tmp_table_param.copy_field; tmp_table_param.save_copy_field_end= curr_join->tmp_table_param.copy_field_end; -#ifdef HAVE_purify +#ifdef HAVE_valgrind if (curr_join != this) #endif { @@ -3848,7 +3848,7 @@ update_ref_and_keys(THD *thd, DYNAMIC_ARRAY *keyuse,JOIN_TAB *join_tab, continue; } -#ifdef HAVE_purify +#ifdef HAVE_valgrind /* Valgrind complains about overlapped memcpy when save_pos==use. */ if (save_pos != use) #endif @@ -15138,7 +15138,7 @@ setup_copy_fields(THD *thd, TMP_TABLE_PARAM *param, DBUG_ASSERT (param->field_count > (uint) (copy - copy_start)); copy->set(tmp, item->result_field); item->result_field->move_field(copy->to_ptr,copy->to_null_ptr,1); -#ifdef HAVE_purify +#ifdef HAVE_valgrind copy->to_ptr[copy->from_length]= 0; #endif copy++; diff --git a/sql/table.cc b/sql/table.cc index c4c12208719..67be4606feb 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -1694,7 +1694,7 @@ int open_table_from_share(THD *thd, TABLE_SHARE *share, const char *alias, outparam->record[1]= outparam->record[0]; // Safety } -#ifdef HAVE_purify +#ifdef HAVE_valgrind /* We need this because when we read var-length rows, we are not updating bytes after end of varchar @@ -1916,7 +1916,7 @@ partititon_err: } } -#if defined(HAVE_purify) && !defined(DBUG_OFF) +#if defined(HAVE_valgrind) && !defined(DBUG_OFF) bzero((char*) bitmaps, bitmap_size*3); #endif diff --git a/storage/archive/azio.c b/storage/archive/azio.c index 6d088f279ac..7443c3f0e02 100644 --- a/storage/archive/azio.c +++ b/storage/archive/azio.c @@ -63,7 +63,7 @@ void read_header(azio_stream *s, unsigned char *buffer); */ static void *az_allocator(void *dummy, uInt items, uInt size) { - return my_malloc((size_t)items*(size_t)size, IF_PURIFY(MY_ZEROFILL, MYF(0))); + return my_malloc((size_t)items*(size_t)size, IF_VALGRIND(MY_ZEROFILL, MYF(0))); } static void az_free(void *dummy, void *address) diff --git a/storage/innobase/buf/buf0buf.c b/storage/innobase/buf/buf0buf.c index 901ce8e0fef..16ed9c9da3c 100644 --- a/storage/innobase/buf/buf0buf.c +++ b/storage/innobase/buf/buf0buf.c @@ -756,7 +756,7 @@ buf_pool_init( /* Wipe contents of frame to eliminate a Purify warning */ -#ifdef HAVE_purify +#ifdef HAVE_valgrind memset(block->frame, '\0', UNIV_PAGE_SIZE); #endif if (srv_use_awe) { diff --git a/storage/innobase/include/univ.i b/storage/innobase/include/univ.i index 8ab62e655ff..6debc9a3e62 100644 --- a/storage/innobase/include/univ.i +++ b/storage/innobase/include/univ.i @@ -107,7 +107,7 @@ operations (very slow); also UNIV_DEBUG must be defined */ #define UNIV_BTR_DEBUG /* check B-tree links */ #define UNIV_LIGHT_MEM_DEBUG /* light memory debugging */ -#ifdef HAVE_purify +#ifdef HAVE_valgrind /* The following sets all new allocated memory to zero before use: this can be used to eliminate unnecessary Purify warnings, but note that it also masks many bugs Purify could detect. For detailed Purify analysis it diff --git a/storage/innobase/srv/srv0start.c b/storage/innobase/srv/srv0start.c index ea88039f3dd..4f261d1171b 100644 --- a/storage/innobase/srv/srv0start.c +++ b/storage/innobase/srv/srv0start.c @@ -104,7 +104,7 @@ static char* srv_monitor_file_name; /* Avoid warnings when using purify */ -#ifdef HAVE_purify +#ifdef HAVE_valgrind static int inno_bcmp(register const char *s1, register const char *s2, register uint len) { diff --git a/storage/maria/ha_maria.cc b/storage/maria/ha_maria.cc index 7fcdeaf69b2..96acdbecd78 100644 --- a/storage/maria/ha_maria.cc +++ b/storage/maria/ha_maria.cc @@ -3166,7 +3166,7 @@ static int ha_maria_init(void *p) ma_checkpoint_init(checkpoint_interval); maria_multi_threaded= maria_in_ha_maria= TRUE; -#if defined(HAVE_REALPATH) && !defined(HAVE_purify) && !defined(HAVE_BROKEN_REALPATH) +#if defined(HAVE_REALPATH) && !defined(HAVE_valgrind) && !defined(HAVE_BROKEN_REALPATH) /* We can only test for sub paths if my_symlink.c is using realpath */ maria_test_invalid_symlink= test_if_data_home_dir; #endif diff --git a/storage/maria/ma_blockrec.c b/storage/maria/ma_blockrec.c index b675b0e8a3f..0ac73f89776 100644 --- a/storage/maria/ma_blockrec.c +++ b/storage/maria/ma_blockrec.c @@ -1594,7 +1594,7 @@ static void make_empty_page(MARIA_HA *info, uchar *buff, uint page_type, bzero(buff, PAGE_HEADER_SIZE); -#if !defined(DONT_ZERO_PAGE_BLOCKS) || defined(HAVE_purify) +#if !defined(DONT_ZERO_PAGE_BLOCKS) || defined(HAVE_valgrind) /* We zero the rest of the block to avoid getting old memory information to disk and to allow the file to be compressed better if archived. diff --git a/storage/maria/ma_check.c b/storage/maria/ma_check.c index f7578468153..e33849bef04 100644 --- a/storage/maria/ma_check.c +++ b/storage/maria/ma_check.c @@ -4522,7 +4522,7 @@ static int sort_key_read(MARIA_SORT_PARAM *sort_param, uchar *key) sort_param->current_filepos, 0); sort_param->real_key_length= int_key.data_length + int_key.ref_length; -#ifdef HAVE_purify +#ifdef HAVE_valgrind bzero(key+sort_param->real_key_length, (sort_param->key_length-sort_param->real_key_length)); #endif @@ -4567,7 +4567,7 @@ static int sort_maria_ft_key_read(MARIA_SORT_PARAM *sort_param, uchar *key) sort_param->current_filepos); sort_param->real_key_length= int_key.data_length + int_key.ref_length; -#ifdef HAVE_purify +#ifdef HAVE_valgrind if (sort_param->key_length > sort_param->real_key_length) bzero(key+sort_param->real_key_length, (sort_param->key_length-sort_param->real_key_length)); @@ -5104,7 +5104,7 @@ static int sort_get_next_record(MARIA_SORT_PARAM *sort_param) llstr(sort_param->pos,llbuff)); continue; } -#ifdef HAVE_purify +#ifdef HAVE_valgrind bzero(sort_param->rec_buff + block_info.rec_len, share->base.extra_rec_buff_size); #endif diff --git a/storage/maria/ma_loghandler.c b/storage/maria/ma_loghandler.c index 6fc15186fcd..fc134d48379 100644 --- a/storage/maria/ma_loghandler.c +++ b/storage/maria/ma_loghandler.c @@ -6194,12 +6194,12 @@ my_bool translog_write_record(LSN *lsn, { uint i; uint len= 0; -#ifdef HAVE_purify +#ifdef HAVE_valgrind ha_checksum checksum= 0; #endif for (i= TRANSLOG_INTERNAL_PARTS; i < part_no; i++) { -#ifdef HAVE_purify +#ifdef HAVE_valgrind /* Find unitialized bytes early */ checksum+= my_checksum(checksum, parts_data[i].str, parts_data[i].length); diff --git a/storage/maria/ma_packrec.c b/storage/maria/ma_packrec.c index 1e954119e8c..4df00d9bb88 100644 --- a/storage/maria/ma_packrec.c +++ b/storage/maria/ma_packrec.c @@ -256,7 +256,7 @@ static my_bool _ma_read_pack_info(MARIA_SHARE *share, File file, (uint) (share->pack.header_length-sizeof(header)), MYF(MY_NABP))) goto err2; -#ifdef HAVE_purify +#ifdef HAVE_valgrind /* Zero bytes accessed by fill_buffer */ bzero(disk_cache + (share->pack.header_length-sizeof(header)), share->base.extra_rec_buff_size); diff --git a/storage/maria/ma_page.c b/storage/maria/ma_page.c index 8d91880eed6..54361b8ee3b 100644 --- a/storage/maria/ma_page.c +++ b/storage/maria/ma_page.c @@ -200,7 +200,7 @@ my_bool _ma_write_keypage(MARIA_PAGE *page, enum pagecache_page_lock lock, /* Verify that keynr is correct */ DBUG_ASSERT(_ma_get_keynr(share, buff) == page->keyinfo->key_nr); -#if defined(EXTRA_DEBUG) && defined(HAVE_purify) && defined(NOT_ANYMORE) +#if defined(EXTRA_DEBUG) && defined(HAVE_valgrind) && defined(NOT_ANYMORE) { /* This is here to catch uninitialized bytes */ uint length= page->size; diff --git a/storage/maria/ma_pagecrc.c b/storage/maria/ma_pagecrc.c index ffb4e90e400..640bb8880f4 100644 --- a/storage/maria/ma_pagecrc.c +++ b/storage/maria/ma_pagecrc.c @@ -318,7 +318,7 @@ my_bool maria_page_filler_set_none(uchar *page __attribute__((unused)), __attribute__((unused)), uchar *data_ptr __attribute__((unused))) { -#ifdef HAVE_purify +#ifdef HAVE_valgrind int4store_aligned(page + ((MARIA_SHARE *)data_ptr)->block_size - CRC_SIZE, 0); #endif diff --git a/storage/maria/ma_search.c b/storage/maria/ma_search.c index 51f979c9e1b..a50f3c49a26 100644 --- a/storage/maria/ma_search.c +++ b/storage/maria/ma_search.c @@ -2172,7 +2172,7 @@ int _ma_calc_bin_pack_key_length(const MARIA_KEY *int_key, s_temp->totlength= key_length= (int_key->data_length + int_key->ref_length+ nod_flag); -#ifdef HAVE_purify +#ifdef HAVE_valgrind s_temp->n_length= s_temp->n_ref_length=0; /* For valgrind */ #endif s_temp->key=key; diff --git a/storage/myisam/mi_check.c b/storage/myisam/mi_check.c index a61b71150ac..dc19d790ec9 100644 --- a/storage/myisam/mi_check.c +++ b/storage/myisam/mi_check.c @@ -3147,7 +3147,7 @@ static int sort_key_read(MI_SORT_PARAM *sort_param, void *key) (info->s->rec_reflength+ _mi_make_key(info, sort_param->key, (uchar*) key, sort_param->record, sort_param->filepos)); -#ifdef HAVE_purify +#ifdef HAVE_valgrind bzero(key+sort_param->real_key_length, (sort_param->key_length-sort_param->real_key_length)); #endif @@ -3187,7 +3187,7 @@ static int sort_ft_key_read(MI_SORT_PARAM *sort_param, void *key) sort_param->real_key_length=(info->s->rec_reflength+ _ft_make_key(info, sort_param->key, key, wptr++, sort_param->filepos)); -#ifdef HAVE_purify +#ifdef HAVE_valgrind if (sort_param->key_length > sort_param->real_key_length) bzero(key+sort_param->real_key_length, (sort_param->key_length-sort_param->real_key_length)); diff --git a/storage/myisam/mi_page.c b/storage/myisam/mi_page.c index 3ea00fa44db..a05a96e514b 100644 --- a/storage/myisam/mi_page.c +++ b/storage/myisam/mi_page.c @@ -86,7 +86,7 @@ int _mi_write_keypage(register MI_INFO *info, register MI_KEYDEF *keyinfo, if ((length=keyinfo->block_length) > IO_SIZE*2 && info->state->key_file_length != page+length) length= ((mi_getint(buff)+IO_SIZE-1) & (uint) ~(IO_SIZE-1)); -#ifdef HAVE_purify +#ifdef HAVE_valgrind { length=mi_getint(buff); bzero((uchar*) buff+length,keyinfo->block_length-length); diff --git a/storage/myisam/mi_search.c b/storage/myisam/mi_search.c index 2c346ea18f7..2844b25ee81 100644 --- a/storage/myisam/mi_search.c +++ b/storage/myisam/mi_search.c @@ -1749,7 +1749,7 @@ _mi_calc_bin_pack_key_length(MI_KEYDEF *keyinfo,uint nod_flag,uchar *next_key, uint length,key_length,ref_length; s_temp->totlength=key_length=_mi_keylength(keyinfo,key)+nod_flag; -#ifdef HAVE_purify +#ifdef HAVE_valgrind s_temp->n_length= s_temp->n_ref_length=0; /* For valgrind */ #endif s_temp->key=key; diff --git a/storage/myisammrg/ha_myisammrg.cc b/storage/myisammrg/ha_myisammrg.cc index 392a8600da3..e6c53958578 100644 --- a/storage/myisammrg/ha_myisammrg.cc +++ b/storage/myisammrg/ha_myisammrg.cc @@ -837,7 +837,7 @@ int ha_myisammrg::info(uint flag) { if (table->s->key_parts && mrg_info.rec_per_key) { -#ifdef HAVE_purify +#ifdef HAVE_valgrind /* valgrind may be unhappy about it, because optimizer may access values between file->keys and table->key_parts, that will be uninitialized. diff --git a/strings/bcmp.c b/strings/bcmp.c index 1b6ed22fc22..39b5f24e055 100644 --- a/strings/bcmp.c +++ b/strings/bcmp.c @@ -24,7 +24,7 @@ #include <my_global.h> #include "m_string.h" -#ifdef HAVE_purify +#ifdef HAVE_valgrind #undef bcmp #undef HAVE_BCMP #endif @@ -50,7 +50,7 @@ uint len; /* 0 <= len <= 65535 */ #else -#ifndef HAVE_purify +#ifndef HAVE_valgrind size_t bcmp(register const uchar *s1,register const uchar *s2, register size_t len) #else diff --git a/strings/decimal.c b/strings/decimal.c index a7770fbb2e1..d8380839889 100644 --- a/strings/decimal.c +++ b/strings/decimal.c @@ -144,7 +144,7 @@ static double scaler1[]= { 1.0, 10.0, 1e2, 1e3, 1e4, 1e5, 1e6, 1e7, 1e8, 1e9 }; -#ifdef HAVE_purify +#ifdef HAVE_valgrind #define sanity(d) DBUG_ASSERT((d)->len > 0) #else #define sanity(d) DBUG_ASSERT((d)->len >0 && ((d)->buf[0] | \ diff --git a/strings/strmake.c b/strings/strmake.c index 903a1b83626..56bd3a8f084 100644 --- a/strings/strmake.c +++ b/strings/strmake.c @@ -51,11 +51,11 @@ char *strmake(register char *dst, register const char *src, size_t length) */ if (length) { -#ifdef HAVE_purify +#ifdef HAVE_valgrind dst[length-1]= 'Z'; #else bfill(dst, length-1, (int) 'Z'); -#endif /* HAVE_purify */ +#endif /* HAVE_valgrind */ } #endif /* EXTRA_DEBUG */ return dst-1; |