Commit 81d65227 authored by msvensson@pilot.mysql.com's avatar msvensson@pilot.mysql.com
Browse files

Merge pilot.mysql.com:/data/msvensson/mysql/bug31167/my50-bug31167 

into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-maint
parents e068e99c e4d7e216

.bzrignore

+5 −0
Original line number Diff line number Diff line
@@ -1345,3 +1345,8 @@ zlib/*.vcproj 
debian/control

debian/defs.mk

include/abi_check

support-files/mysqld_multi.server

tests/bug25714

cscope.in.out

cscope.out

cscope.po.out

BUILD/SETUP.sh

+25 −0
Original line number Diff line number Diff line
@@ -138,3 +138,28 @@ then 
  echo "$CC" | grep "ccache" > /dev/null || CC="ccache $CC"

  echo "$CXX" | grep "ccache" > /dev/null || CXX="ccache $CXX"

fi



# gcov



# The  -fprofile-arcs and -ftest-coverage options cause GCC to instrument the

# code with profiling information used by gcov.

# The -DDISABLE_TAO_ASM is needed to avoid build failures in Yassl.

# The -DHAVE_gcov enables code to write out coverage info even when crashing.



gcov_compile_flags="-fprofile-arcs -ftest-coverage"

gcov_compile_flags="$gcov_compile_flags -DDISABLE_TAO_ASM"

gcov_compile_flags="$gcov_compile_flags -DMYSQL_SERVER_SUFFIX=-gcov -DHAVE_gcov"



# GCC4 needs -fprofile-arcs -ftest-coverage on the linker command line (as well

# as on the compiler command line), and this requires setting LDFLAGS for BDB.



gcov_link_flags="-fprofile-arcs -ftest-coverage"



gcov_configs="--disable-shared"



# gprof



gprof_compile_flags="-O2 -pg -g"



gprof_link_flags="--disable-shared $static_link"

BUILD/compile-amd64-gcov

0 → 100755
+17 −0
Original line number Diff line number Diff line 
#! /bin/sh



path=`dirname $0`

. "$path/SETUP.sh"



# Need to disable ccache, or we loose the gcov-needed compiler output files.

CCACHE_DISABLE=1

export CCACHE_DISABLE



export LDFLAGS="$gcov_link_flags"



extra_flags="$amd64_cflags $debug_cflags $max_cflags $gcov_compile_flags"

c_warnings="$c_warnings $debug_extra_warnings"

cxx_warnings="$cxx_warnings $debug_extra_warnings"

extra_configs="$amd64_configs $debug_configs $gcov_configs $max_configs"



. "$path/FINISH.sh"

BUILD/compile-amd64-gprof

0 → 100755
+9 −0
Original line number Diff line number Diff line 
#! /bin/sh



path=`dirname $0`

. "$path/SETUP.sh"



extra_flags="$amd64_cflags $gprof_compile_flags"

extra_configs="$amd64_configs $debug_configs $gprof_link_flags"



. "$path/FINISH.sh"

BUILD/compile-pentium-gcov

+3 −10
Original line number Diff line number Diff line
@@ -7,18 +7,11 @@ path=`dirname $0` 
CCACHE_DISABLE=1

export CCACHE_DISABLE



# GCC4 needs -fprofile-arcs -ftest-coverage on the linker command line (as well

# as on the compiler command line), and this requires setting LDFLAGS for BDB.

export LDFLAGS="-fprofile-arcs -ftest-coverage"

export LDFLAGS="$gcov_link_flags"



# The  -fprofile-arcs and -ftest-coverage options cause GCC to instrument the

# code with profiling information used by gcov.

# The -DDISABLE_TAO_ASM is needed to avoid build failures in Yassl.

# The -DHAVE_gcov enables code to write out coverage info even when crashing.

extra_flags="$pentium_cflags -fprofile-arcs -ftest-coverage -DDISABLE_TAO_ASM $debug_cflags $max_cflags -DMYSQL_SERVER_SUFFIX=-gcov -DHAVE_gcov"

extra_flags="$pentium_cflags $debug_cflags $max_cflags $gcov_compile_flags"

c_warnings="$c_warnings $debug_extra_warnings"

cxx_warnings="$cxx_warnings $debug_extra_warnings"

extra_configs="$pentium_configs $debug_configs --disable-shared $static_link"

extra_configs="$extra_configs $max_configs"

extra_configs="$pentium_configs $debug_configs $gcov_configs $max_configs"



. "$path/FINISH.sh"