diff options
| author | unknown <monty@narttu.mysql.fi> | 2007-01-22 19:18:22 +0200 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2007-01-22 19:18:22 +0200 |
| commit | a043cd152da16624b74ec9ee4d259b4570ef4dcd (patch) | |
| tree | e1f7760d143c61bab6297ac28959e5b752a764ed /BUILD/SETUP.sh | |
| parent | 10f4f15e83f19d85cae4bff9240973c216ea98c7 (diff) | |
| parent | b4f80eedf3c25773d1e116ab915138096ec713f3 (diff) | |
| download | mariadb-git-a043cd152da16624b74ec9ee4d259b4570ef4dcd.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/home/my/mysql-5.1
BUILD/SETUP.sh:
Auto merged
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
Auto merged
mysql-test/extra/rpl_tests/rpl_row_basic.test:
Auto merged
mysql-test/include/mix1.inc:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/r/view.result:
Auto merged
mysql-test/t/ctype_utf8.test:
Auto merged
mysql-test/t/delayed.test:
Auto merged
mysql-test/t/innodb.test:
Auto merged
mysql-test/t/insert_select.test:
Auto merged
mysql-test/t/myisam.test:
Auto merged
mysql-test/t/ndb_index_unique.test:
Auto merged
mysql-test/t/rpl_row_create_table.test:
Auto merged
mysql-test/t/rpl_sp.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
mysql-test/t/type_binary.test:
Auto merged
mysql-test/t/type_varchar.test:
Auto merged
mysql-test/t/view.test:
Auto merged
sql/handler.cc:
Auto merged
sql/sql_table.cc:
Auto merged
mysql-test/r/rpl_sp.result:
Manual merge
mysql-test/t/ndb_update.test:
Manual merge
sql/share/errmsg.txt:
Manual merge
Diffstat (limited to 'BUILD/SETUP.sh')
| -rwxr-xr-x | BUILD/SETUP.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh index 1f62ffe7c26..35d35e2dc1e 100755 --- a/BUILD/SETUP.sh +++ b/BUILD/SETUP.sh @@ -92,9 +92,9 @@ 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" + warnings="$warnings -Wwrite-strings -Wunused-function -Wunused-label -Wunused-value -Wunused-variable -Wshadow" # C warnings - c_warnings="$warnings -Wunused" + c_warnings="$warnings -Wunused-parameter" # C++ warnings cxx_warnings="$warnings -Woverloaded-virtual -Wsign-promo -Wreorder" cxx_warnings="$warnings -Wctor-dtor-privacy -Wnon-virtual-dtor" |