diff options
author | unknown <kent@mysql.com> | 2005-09-30 16:37:02 +0200 |
---|---|---|
committer | unknown <kent@mysql.com> | 2005-09-30 16:37:02 +0200 |
commit | f3c622356f46a47fcea35ea9902052c49f5eea83 (patch) | |
tree | ffd378671feab72a82c40f089c476cceec3a7d4c /BUILD | |
parent | 2477092651ab4d9b2bd0cb47b938cfe948f2b1d8 (diff) | |
parent | b446550e2c6447ebc7ac827ab775473f125405e4 (diff) | |
download | mariadb-git-f3c622356f46a47fcea35ea9902052c49f5eea83.tar.gz |
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
BUILD/SETUP.sh:
Auto merged
client/mysql.cc:
Auto merged
mysql-test/lib/mtr_report.pl:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/t/mysqldump.test:
Auto merged
scripts/make_win_src_distribution.sh:
Auto merged
sql/des_key_file.cc:
Auto merged
Diffstat (limited to 'BUILD')
-rwxr-xr-x | BUILD/SETUP.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh index 598aaaa80ae..64be7a34f95 100755 --- a/BUILD/SETUP.sh +++ b/BUILD/SETUP.sh @@ -48,7 +48,7 @@ AM_MAKEFLAGS="-j 4" # The following warning flag will give too many warnings: # -Wshadow -Wunused -Winline (The later isn't usable in C++ as # __attribute()__ doesn't work with gnu C++) -global_warnings="-Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings" +global_warnings="-Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings -ansi" #debug_extra_warnings="-Wuninitialized" c_warnings="$global_warnings -Wunused" cxx_warnings="$global_warnings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor" |