mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 05:22:25 +01:00
edc89f7511
- Added --verbose to BUILD scripts to get make to write out compile commands. - Detect if AM_EXTRA_MAKEFLAGS=VERBOSE=1 was used with build scripts. - Don't write warnings about replication variables when doing bootstrap. - Fixed that mysql_cond_wait() and mysql_cond_timedwait() will report original source file in case of errors. - Ignore some compiler warnings BUILD/FINISH.sh: Detect if AM_EXTRA_MAKEFLAGS=VERBOSE=1 or --verbose was used BUILD/SETUP.sh: Added --verbose to print out the full compile lines Updated help message client/mysqltest.cc: Fixed that one can use 'replace' with cat_file cmake/configure.pl: If --verbose is used, get make to write out compile commands debian/dist/Debian/rules: Added $AM_EXTRA_MAKEFLAGS to get VERBOSE=1 on buildbot builds debian/dist/Ubuntu/rules: Added $AM_EXTRA_MAKEFLAGS to get VERBOSE=1 on buildbot builds include/my_pthread.h: Made set_timespec_time_nsec() more portable. include/mysql/psi/mysql_thread.h: Fixed that mysql_cond_wait() and mysql_cond_timedwait() will report original source file in case of errors. mysql-test/suite/innodb/r/auto_increment_dup.result: Fixed wrong DBUG_SYNC mysql-test/suite/innodb/t/auto_increment_dup.test: Fixed wrong DBUG_SYNC mysql-test/suite/perfschema/include/upgrade_check.inc: Make test more portable for changes in *.sql files mysql-test/suite/perfschema/r/pfs_upgrade.result: Updated test results mysql-test/valgrind.supp: Ignore running Aria checkpoint thread scripts/mysqlaccess.sh: Changed reference of bugs database Ensure that also client-server group is read. sql/handler.cc: Added missing syncpoint sql/mysqld.cc: Don't write warnings about replication variables when doing bootstrap sql/mysqld.h: Don't write warnings about replication variables when doing bootstrap sql/rpl_rli.cc: Don't write warnings about replication variables when doing bootstrap sql/sql_insert.cc: Don't mask SERVER_SHUTDOWN in insert_delayed This is done to be able to distingush between shutdown and interrupt errors support-files/compiler_warnings.supp: Ignore some compiler warnings in xtradb,innobase, oqgraph, yassl, string3.h
71 lines
1.9 KiB
Bash
71 lines
1.9 KiB
Bash
# Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
|
|
#
|
|
# This program is free software; you can redistribute it and/or
|
|
# modify it under the terms of the GNU Library General Public
|
|
# License as published by the Free Software Foundation; version 2
|
|
# of the License.
|
|
#
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
# Library General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU Library General Public
|
|
# License along with this library; if not, write to the Free
|
|
# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
|
|
# MA 02110-1301, USA
|
|
|
|
cflags="$c_warnings $extra_flags $EXTRA_FLAGS $EXTRA_CFLAGS"
|
|
cxxflags="$cxx_warnings $base_cxxflags $extra_flags $EXTRA_FLAGS $EXTRA_CXXFLAGS"
|
|
extra_configs="$extra_configs $local_infile_configs $EXTRA_CONFIGS"
|
|
|
|
configure="./configure $base_configs $extra_configs"
|
|
|
|
if test "$just_print" = "1" -a "$just_configure" = "1"
|
|
then
|
|
just_print=""
|
|
configure="$configure --print"
|
|
fi
|
|
|
|
if test "$AM_EXTRA_MAKEFLAGS" = "VERBOSE=1" -o "$verbose_make" = "1"
|
|
then
|
|
configure="$configure --verbose"
|
|
fi
|
|
|
|
commands="\
|
|
/bin/rm -rf configure;
|
|
/bin/rm -rf CMakeCache.txt CMakeFiles/
|
|
|
|
path=`dirname $0`
|
|
. \"$path/autorun.sh\""
|
|
|
|
if [ -z "$just_clean" ]
|
|
then
|
|
commands="$commands
|
|
CC=\"$CC\" CFLAGS=\"$cflags\" CXX=\"$CXX\" CXXFLAGS=\"$cxxflags\" CXXLDFLAGS=\"$CXXLDFLAGS\" \
|
|
$configure"
|
|
fi
|
|
|
|
if [ -z "$just_configure" -a -z "$just_clean" ]
|
|
then
|
|
commands="$commands
|
|
|
|
$make $AM_MAKEFLAGS $AM_EXTRA_MAKEFLAGS"
|
|
|
|
if [ "x$strip" = "xyes" ]
|
|
then
|
|
commands="$commands
|
|
|
|
mkdir -p tmp
|
|
nm --numeric-sort sql/mysqld > tmp/mysqld.sym
|
|
objdump -d sql/mysqld > tmp/mysqld.S
|
|
strip sql/mysqld"
|
|
fi
|
|
fi
|
|
|
|
if test -z "$just_print"
|
|
then
|
|
eval "set -x; $commands"
|
|
else
|
|
echo "$commands"
|
|
fi
|