mirror of
https://github.com/MariaDB/server.git
synced 2026-05-16 20:07:13 +02:00
We are now using Valgrind rather than purify, and have for quite some time.
Consequently, rename HAVE_purify to HAVE_valgrind, and related changes.
Leave some comments about purify when not clear that they apply also to Valgrind.
Fix redundant IF_VALGRIND declaration.
Misc. small fixes:
- Fixes for pool-of-threads patch.
- Fixes for push of PBXT storage engine.
- mysql-test-run.pl fix.
- Fix build problem in compile-pentium64-max.
BUILD/SETUP.sh:
Rename purify -> valgrind.
BUILD/build_mccge.sh:
Rename purify -> valgrind.
BUILD/compile-dist:
Fix that PBXT was missing in source tarball after `BUILD/compile-dist && make dist`
BUILD/compile-pentium64-max:
Fix a build problem with BUILD/compile-pentium64-max on CentOS/Fedora Core 10 amd64.
On these systems, there is libz.so but no libz.a. Finding libz.so, ./configure decides
to use system zlib. But since BUILD/compile-pentium64-max builds a fully static binary
with -all-static, the link of mysqld fails due to missing libz.a.
Fix by using bundled zlib in the build script.
BUILD/compile-solaris-sparc-purify:
Rename purify -> valgrind.
include/m_string.h:
Rename purify -> valgrind.
include/my_global.h:
Rename purify -> valgrind.
mysql-test/Makefile.am:
Fix that PBXT test suite was missing from `make dist` source tarball.
mysql-test/lib/mtr_unique.pm:
Better fix to avoid races when chmod'ing the semaphore file.
(Though using chmod 666 shared files in /tmp/ is still not a very good solution).
mysql-test/t/pool_of_threads.cnf:
Fix that test case pool_of_threads fails if run on mysqld with no --with-libevent support.
mysys/mf_qsort.c:
Rename purify -> valgrind.
mysys/my_alloc.c:
Rename purify -> valgrind.
mysys/my_init.c:
Rename purify -> valgrind.
mysys/my_rnd.c:
Rename purify -> valgrind.
mysys/safemalloc.c:
Rename purify -> valgrind.
scripts/mysql_config.pl.in:
Rename purify -> valgrind.
scripts/mysql_config.sh:
Rename purify -> valgrind.
sql/field_conv.cc:
Rename purify -> valgrind.
sql/filesort.cc:
Rename purify -> valgrind.
sql/ha_partition.cc:
Rename purify -> valgrind.
sql/hostname.cc:
Rename purify -> valgrind.
sql/item_timefunc.cc:
Rename purify -> valgrind.
sql/log_event.cc:
Rename purify -> valgrind.
sql/log_event_old.cc:
Rename purify -> valgrind.
sql/my_decimal.h:
Rename purify -> valgrind.
sql/mysqld.cc:
Rename purify -> valgrind.
Fix redundant IF_VALGRIND declaration.
sql/opt_range.cc:
Rename purify -> valgrind.
sql/opt_range.h:
Rename purify -> valgrind.
sql/records.cc:
Rename purify -> valgrind.
sql/rpl_rli.cc:
Rename purify -> valgrind.
sql/rpl_rli.h:
Rename purify -> valgrind.
sql/set_var.cc:
Fix missing static declaration on pool_of_threads.
sql/slave.cc:
Rename purify -> valgrind.
sql/sql_base.cc:
Rename purify -> valgrind.
sql/sql_binlog.cc:
Rename purify -> valgrind.
sql/sql_class.cc:
Rename purify -> valgrind.
sql/sql_list.h:
Rename purify -> valgrind.
sql/sql_load.cc:
Rename purify -> valgrind.
sql/sql_select.cc:
Rename purify -> valgrind.
sql/table.cc:
Rename purify -> valgrind.
storage/archive/azio.c:
Rename purify -> valgrind.
storage/innobase/buf/buf0buf.c:
Rename purify -> valgrind.
storage/innobase/include/univ.i:
Rename purify -> valgrind.
storage/innobase/srv/srv0start.c:
Rename purify -> valgrind.
storage/maria/ha_maria.cc:
Rename purify -> valgrind.
storage/maria/ma_blockrec.c:
Rename purify -> valgrind.
storage/maria/ma_check.c:
Rename purify -> valgrind.
storage/maria/ma_loghandler.c:
Rename purify -> valgrind.
storage/maria/ma_packrec.c:
Rename purify -> valgrind.
storage/maria/ma_page.c:
Rename purify -> valgrind.
storage/maria/ma_pagecrc.c:
Rename purify -> valgrind.
storage/maria/ma_search.c:
Rename purify -> valgrind.
storage/myisam/mi_check.c:
Rename purify -> valgrind.
storage/myisam/mi_page.c:
Rename purify -> valgrind.
storage/myisam/mi_search.c:
Rename purify -> valgrind.
storage/myisammrg/ha_myisammrg.cc:
Rename purify -> valgrind.
strings/bcmp.c:
Rename purify -> valgrind.
strings/decimal.c:
Rename purify -> valgrind.
strings/strmake.c:
Rename purify -> valgrind.
This commit is contained in:
parent
059b9356a1
commit
b125770aaa
59 changed files with 115 additions and 119 deletions
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue