mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 03:52:35 +01:00
bd4e65515f
- Added braces around expressions with &&, ||, & and | - Added empty line before ; for empty while and for loops - Added () around if with assignments - Removed const before function returning simple type Changed BUILD scripts to not build with NDB BUILD/SETUP.sh: By default, don't build ndb with --max in Maria tree. NDB is not kept up to date anyway in 5.1 client/mysql.cc: Added braces around && to get rid of compiler warnings sql/event_db_repository.cc: Added braces around && to get rid of compiler warnings sql/events.cc: Added braces around && to get rid of compiler warnings sql/field.cc: Added braces around && to get rid of compiler warnings Fixed for loops sql/field.h: Added braces around & to get rid of compiler warnings sql/field_conv.cc: Added braces around && to get rid of compiler warnings Fixed bug when copying between DATETIME fields and strict dates are used Removed not needeed else sql/gstream.cc: Added braces around && to get rid of compiler warnings sql/ha_ndbcluster.cc: Added braces around && to get rid of compiler warnings Added {} to get rid of compiler warnings sql/handler.cc: Added braces around && to get rid of compiler warnings sql/item.cc: Added braces around && to get rid of compiler warnings sql/item_cmpfunc.cc: Added braces around && to get rid of compiler warnings Removed some not needed space sql/item_func.cc: Added braces around && to get rid of compiler warnings sql/item_strfunc.cc: Added braces around && to get rid of compiler warnings sql/item_subselect.cc: Added braces around && to get rid of compiler warnings sql/item_sum.cc: Added braces around && to get rid of compiler warnings sql/item_timefunc.cc: Added braces around && to get rid of compiler warnings sql/item_xmlfunc.cc: Added empty line before ; for empty while and for loops sql/log.cc: Added braces around && to get rid of compiler warnings sql/log_event.cc: Added braces around && to get rid of compiler warnings Removed not needed else sql/log_event_old.cc: Added braces around && to get rid of compiler warnings sql/opt_range.cc: Added braces around && to get rid of compiler warnings sql/opt_sum.cc: Added braces around && to get rid of compiler warnings sql/set_var.cc: Added empty line before ; for empty while and for loops Added () around if with assignments sql/slave.cc: Added braces around && to get rid of compiler warnings Added empty line before ; for empty while and for loops sql/spatial.h: Added braces around && to get rid of compiler warnings sql/sql_acl.cc: Added braces around && to get rid of compiler warnings sql/sql_analyse.cc: Added empty line before ; for empty while and for loops sql/sql_base.cc: Added braces around && to get rid of compiler warnings sql/sql_connect.cc: Added braces around && to get rid of compiler warnings sql/sql_db.cc: Added braces around && to get rid of compiler warnings sql/sql_delete.cc: Added braces around && to get rid of compiler warnings sql/sql_help.cc: Added empty line before ; for empty while and for loops sql/sql_insert.cc: Added braces around && to get rid of compiler warnings Added () around if with assignments sql/sql_lex.cc: Cast char array references to uchar; Fixed wrong array referencing when using characters > ASCII 128 in SQL statments Added empty line before ; for empty while and for loops Trivial indent fixes Added braces around && to get rid of compiler warnings sql/sql_load.cc: Added braces around && to get rid of compiler warnings sql/sql_parse.cc: Added braces around && to get rid of compiler warnings sql/sql_partition.cc: Added braces around && to get rid of compiler warnings sql/sql_plugin.cc: Fixed bug in detecing if option variable should be readonly Added empty line before ; for empty while and for loops sql/sql_prepare.cc: Added braces around && to get rid of compiler warnings sql/sql_select.cc: Added braces around && to get rid of compiler warnings Added () around if with assignments Added empty line before ; for empty while and for loops sql/sql_show.cc: Added braces around && to get rid of compiler warnings sql/sql_table.cc: Added braces around && to get rid of compiler warnings sql/sql_trigger.cc: Added braces around && to get rid of compiler warnings sql/sql_update.cc: Added braces around && to get rid of compiler warnings sql/sql_yacc.yy: Added braces around && to get rid of compiler warnings sql/table.cc: Added braces around && to get rid of compiler warnings sql/table.h: Added braces around && to get rid of compiler warnings sql/time.cc: Added braces around && to get rid of compiler warnings sql/tztime.cc: Added braces around && to get rid of compiler warnings sql/uniques.cc: Added braces around && to get rid of compiler warnings storage/federated/ha_federated.cc: Fixed bug in testing of variable to ha_info() (Not critical) storage/heap/ha_heap.cc: Added braces around && to get rid of compiler warnings storage/maria/ha_maria.cc: Fixed bug: Mark that maria_log_dir_path is readonly Added braces around && to get rid of compiler warnings storage/ndb/include/ndbapi/NdbEventOperation.hpp: Removed const before function returning simple type storage/ndb/include/ndbapi/NdbOperation.hpp: Removed const before function returning simple type storage/ndb/src/ndbapi/Ndb.cpp: Added empty line before ; for empty while and for loops storage/ndb/src/ndbapi/NdbEventOperation.cpp: Removed const before function returning simple type storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp: Removed const before function returning simple type storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp: Removed const before function returning simple type storage/ndb/src/ndbapi/NdbRecAttr.cpp: Added empty line before ; for empty while and for loops storage/ndb/src/ndbapi/TransporterFacade.hpp: Added braces around && to get rid of compiler warnings
239 lines
6.6 KiB
Bash
Executable file
239 lines
6.6 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
########################################################################
|
|
|
|
get_key_value()
|
|
{
|
|
echo "$1" | sed 's/^--[a-zA-Z_-]*=//'
|
|
}
|
|
|
|
usage()
|
|
{
|
|
cat <<EOF
|
|
Usage: $0 [-h|-n] [configure-options]
|
|
-h, --help Show this help message.
|
|
-n, --just-print Don't actually run any commands; just print them.
|
|
-c, --just-configure Stop after running configure.
|
|
--with-debug=full Build with full debug.
|
|
--warning-mode=[old|pedantic]
|
|
Influences the debug flags. Old is default.
|
|
--prefix=path Build with prefix 'path'.
|
|
|
|
Note: this script is intended for internal use by MySQL developers.
|
|
EOF
|
|
}
|
|
|
|
parse_options()
|
|
{
|
|
while test $# -gt 0
|
|
do
|
|
case "$1" in
|
|
--prefix=*)
|
|
prefix=`get_key_value "$1"`;;
|
|
--with-debug=full)
|
|
full_debug="=full";;
|
|
--warning-mode=*)
|
|
warning_mode=`get_key_value "$1"`;;
|
|
-c | --just-configure)
|
|
just_configure=1;;
|
|
-n | --just-print | --print)
|
|
just_print=1;;
|
|
-h | --help)
|
|
usage
|
|
exit 0;;
|
|
*)
|
|
echo "Unknown option '$1'"
|
|
exit 1;;
|
|
esac
|
|
shift
|
|
done
|
|
}
|
|
|
|
########################################################################
|
|
|
|
if test ! -f sql/mysqld.cc
|
|
then
|
|
echo "You must run this script from the MySQL top-level directory"
|
|
exit 1
|
|
fi
|
|
|
|
prefix="/usr/local/mysql"
|
|
just_print=
|
|
just_configure=
|
|
full_debug=
|
|
warning_mode=
|
|
|
|
parse_options "$@"
|
|
|
|
if test -n "$MYSQL_BUILD_PREFIX"
|
|
then
|
|
prefix="$MYSQL_BUILD_PREFIX"
|
|
fi
|
|
|
|
set -e
|
|
|
|
#
|
|
# Check for the CPU and set up CPU specific flags. We may reset them
|
|
# later.
|
|
#
|
|
path=`dirname $0`
|
|
. "$path/check-cpu"
|
|
|
|
export AM_MAKEFLAGS
|
|
AM_MAKEFLAGS="-j 6"
|
|
|
|
# SSL library to use.--with-ssl will select our bundled yaSSL
|
|
# implementation of SSL. To use openSSl you will nee too point out
|
|
# the location of openSSL headers and lbs on your system.
|
|
# Ex --with-ssl=/usr
|
|
SSL_LIBRARY=--with-ssl
|
|
|
|
if [ "x$warning_mode" != "xpedantic" ]; then
|
|
# Both C and C++ warnings
|
|
warnings="-Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W"
|
|
warnings="$warnings -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare"
|
|
warnings="$warnings -Wwrite-strings -Wunused-function -Wunused-label -Wunused-value -Wunused-variable"
|
|
|
|
# For more warnings, uncomment the following line
|
|
# warnings="$global_warnings -Wshadow"
|
|
|
|
# C warnings
|
|
c_warnings="$warnings -Wunused-parameter"
|
|
# C++ warnings
|
|
cxx_warnings="$warnings"
|
|
# cxx_warnings="$cxx_warnings -Woverloaded-virtual -Wsign-promo"
|
|
cxx_warnings="$cxx_warnings -Wreorder"
|
|
cxx_warnings="$cxx_warnings -Wctor-dtor-privacy -Wnon-virtual-dtor"
|
|
# Added unless --with-debug=full
|
|
debug_extra_cflags="-O0 -g3 -gdwarf-2" #1 -Wuninitialized"
|
|
else
|
|
warnings="-W -Wall -ansi -pedantic -Wno-long-long -Wno-unused -D_POSIX_SOURCE"
|
|
c_warnings="$warnings"
|
|
cxx_warnings="$warnings -std=c++98"
|
|
# NOTE: warning mode should not influence optimize/debug mode.
|
|
# Please feel free to add a separate option if you don't feel it's an overkill.
|
|
debug_extra_cflags="-O0"
|
|
# Reset CPU flags (-mtune), they don't work in -pedantic mode
|
|
check_cpu_cflags=""
|
|
fi
|
|
|
|
# Set flags for various build configurations.
|
|
# Used in -valgrind builds
|
|
valgrind_flags="-USAFEMALLOC -UFORCE_INIT_OF_VARS -DHAVE_purify "
|
|
valgrind_flags="$valgrind_flags -DMYSQL_SERVER_SUFFIX=-valgrind-max"
|
|
#
|
|
# Used in -debug builds
|
|
debug_cflags="-DUNIV_MUST_NOT_INLINE -DEXTRA_DEBUG -DFORCE_INIT_OF_VARS "
|
|
debug_cflags="$debug_cflags -DSAFEMALLOC -DPEDANTIC_SAFEMALLOC -DSAFE_MUTEX"
|
|
error_inject="--with-error-inject "
|
|
#
|
|
# Base C++ flags for all builds
|
|
base_cxxflags="-felide-constructors -fno-exceptions -fno-rtti"
|
|
#
|
|
# Flags for optimizing builds.
|
|
# Be as fast as we can be without losing our ability to backtrace.
|
|
fast_cflags="-O3 -fno-omit-frame-pointer"
|
|
|
|
debug_configs="--with-debug$full_debug"
|
|
if [ -z "$full_debug" ]
|
|
then
|
|
debug_cflags="$debug_cflags $debug_extra_cflags"
|
|
fi
|
|
|
|
#
|
|
# Configuration options.
|
|
#
|
|
base_configs="--prefix=$prefix --enable-assembler "
|
|
base_configs="$base_configs --with-extra-charsets=complex "
|
|
base_configs="$base_configs --enable-thread-safe-client "
|
|
base_configs="$base_configs --with-big-tables"
|
|
base_configs="$base_configs --with-plugin-maria --with-maria-tmp-tables"
|
|
|
|
if test -d "$path/../cmd-line-utils/readline"
|
|
then
|
|
base_configs="$base_configs --with-readline"
|
|
elif test -d "$path/../cmd-line-utils/libedit"
|
|
then
|
|
base_configs="$base_configs --with-libedit"
|
|
fi
|
|
|
|
static_link="--with-mysqld-ldflags=-all-static "
|
|
static_link="$static_link --with-client-ldflags=-all-static"
|
|
# we need local-infile in all binaries for rpl000001
|
|
# if you need to disable local-infile in the client, write a build script
|
|
# and unset local_infile_configs
|
|
local_infile_configs="--enable-local-infile"
|
|
|
|
|
|
max_no_embedded_configs="$SSL_LIBRARY --with-plugins=max"
|
|
max_no_ndb_configs="$SSL_LIBRARY --with-plugins=max-no-ndb --with-embedded-server"
|
|
max_configs="$SSL_LIBRARY --with-plugins=max --with-embedded-server"
|
|
# Disable NDB in maria max builds
|
|
max_configs=$max_no_ndb_configs
|
|
|
|
#
|
|
# CPU and platform specific compilation flags.
|
|
#
|
|
alpha_cflags="$check_cpu_cflags -Wa,-m$cpu_flag"
|
|
amd64_cflags="$check_cpu_cflags"
|
|
amd64_cxxflags="" # If dropping '--with-big-tables', add here "-DBIG_TABLES"
|
|
pentium_cflags="$check_cpu_cflags"
|
|
pentium64_cflags="$check_cpu_cflags -m64"
|
|
ppc_cflags="$check_cpu_cflags"
|
|
sparc_cflags=""
|
|
|
|
if gmake --version > /dev/null 2>&1
|
|
then
|
|
make=gmake
|
|
else
|
|
make=make
|
|
fi
|
|
|
|
if test -z "$CC" ; then
|
|
CC=gcc
|
|
fi
|
|
|
|
if test -z "$CXX" ; then
|
|
CXX=gcc
|
|
fi
|
|
|
|
# If ccache (a compiler cache which reduces build time)
|
|
# (http://samba.org/ccache) is installed, use it.
|
|
# We use 'grep' and hope 'grep' will work as expected
|
|
# (returns 0 if finds lines)
|
|
if test "$USING_GCOV" != "1"
|
|
then
|
|
# Not using gcov; Safe to use ccache
|
|
CCACHE_GCOV_VERSION_ENABLED=1
|
|
fi
|
|
|
|
if ccache -V > /dev/null 2>&1 && test "$CCACHE_GCOV_VERSION_ENABLED" = "1"
|
|
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"
|
|
|