Commit e0985d3d authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/bkroot/mysql-5.1-new 

into  mysql.com:/home/bk/b18436-mysql-5.1-new
parents fbab1349 fb4bd32a

BUILD/SETUP.sh

+1 −2
Original line number Diff line number Diff line
@@ -53,14 +53,13 @@ SSL_LIBRARY=--with-yassl 
# __attribute()__ doesn't work with gnu C++)



global_warnings="-Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings"

#debug_extra_warnings="-Wuninitialized"

c_warnings="$global_warnings -Wunused"

cxx_warnings="$global_warnings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor"

base_max_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-big-tables --with-blackhole-storage-engine --with-federated-storage-engine --with-csv-storage-engine --with-example-storage-engine --with-partition $SSL_LIBRARY"

base_max_no_ndb_configs="--with-innodb --with-berkeley-db --without-ndbcluster --with-archive-storage-engine --with-big-tables --with-blackhole-storage-engine --with-federated-storage-engine --with-csv-storage-engine --with-example-storage-engine --with-partition $SSL_LIBRARY"

max_leave_isam_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-federated-storage-engine --with-blackhole-storage-engine --with-csv-storage-engine --with-example-storage-engine --with-embedded-server --with-big-tables --with-partition $SSL_LIBRARY"

max_configs="$base_max_configs --with-embedded-server"

max_no_ndb_configs="$base_max_no_ndb_configs --with-embedded-server"

valgrind_flags="-USAFEMALLOC -UFORCE_INIT_OF_VARS -DHAVE_purify -DMYSQL_SERVER_SUFFIX=-valgrind-max"



path=`dirname $0`

. "$path/check-cpu"

BUILD/compile-amd64-debug-max

+1 −1
Original line number Diff line number Diff line 
#! /bin/sh

path=`dirname $0`

. "$path/SETUP.sh"

extra_flags="$amd64_cflags $debug_cflags $max_cflags"

extra_flags="$amd64_cflags $debug_cflags"

c_warnings="$c_warnings $debug_extra_warnings"

cxx_warnings="$cxx_warnings $debug_extra_warnings"

extra_configs="$amd64_configs $debug_configs $max_configs"

BUILD/compile-amd64-debug-max-no-ndb

+1 −1
Original line number Diff line number Diff line 
#! /bin/sh

path=`dirname $0`

. "$path/SETUP.sh"

extra_flags="$amd64_cflags $debug_cflags $max_cflags"

extra_flags="$amd64_cflags $debug_cflags"

c_warnings="$c_warnings $debug_extra_warnings"

cxx_warnings="$cxx_warnings $debug_extra_warnings"

extra_configs="$amd64_configs $debug_configs $max_no_ndb_configs"

BUILD/compile-amd64-max

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 


path=`dirname $0`

. "$path/SETUP.sh"

extra_flags="$amd64_cflags $fast_cflags $max_cflags -g"

extra_flags="$amd64_cflags $fast_cflags -g"

extra_configs="$amd64_configs $max_configs"



. "$path/FINISH.sh"

BUILD/compile-darwin-mwcc

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ else 
      extra_configs="$debug_configs"

      ;;

    debug-max)

      extra_flags="$ppc_cflags $debug_cflags $max_cflags"

      extra_flags="$ppc_cflags $debug_cflags"

      c_warnings="$c_warnings $debug_extra_warnings"

      cxx_warnings="$cxx_warnings $debug_extra_warnings"

      extra_configs="$debug_configs $max_configs"