diff options
author | Michael Widenius <monty@askmonty.org> | 2012-06-05 14:09:18 +0300 |
---|---|---|
committer | Michael Widenius <monty@askmonty.org> | 2012-06-05 14:09:18 +0300 |
commit | 56ea8e9c0539a4dc95659ab4ba4b94956c7119e7 (patch) | |
tree | f1064496ed78c4ee1c4270ede3dcba94cf1a02ec /BUILD | |
parent | b889f6999367c9415f5806d2ea6ec104387ba1ff (diff) | |
download | mariadb-git-56ea8e9c0539a4dc95659ab4ba4b94956c7119e7.tar.gz |
Fixed build failures found by buildbot
- Added suppression of warnings
- Fixed some test cases
BUILD/FINISH.sh:
Added AM_EXTRA_MAKEFLAGS
BUILD/SETUP.sh:
Added option --extra-makeflags
client/mysqldump.c:
Added suppression
mysql-test/r/mysql.result:
Updated results
mysql-test/r/mysql_upgrade.result:
Updated results
mysql-test/r/partition_innodb_plugin.result:
Updated results
mysql-test/r/partition_open_files_limit.result:
Updated results
mysql-test/r/symlink.result:
Updated results
mysql-test/suite/innodb/r/innodb-create-options.result:
Updated results
mysql-test/suite/innodb/t/innodb-create-options.test:
Don't print error message (as it's varies on different system)
mysql-test/t/mysql.test:
Don't print error message (as it's varies on different system)
mysql-test/t/mysql_upgrade.test:
Fixed checking of error number
mysql-test/t/partition_innodb_plugin.test:
Don't print error message (as it's varies on different system)
plugin/semisync/semisync_master.cc:
Added suppression
sql/ha_partition.cc:
Added suppression
sql/item_subselect.cc:
Added suppression
sql/multi_range_read.cc:
Added suppression
sql/sql_parse.cc:
Added suppression
sql/sql_select.cc:
Added suppression
storage/innobase/handler/ha_innodb.cc:
Removed not used variable
storage/maria/ma_delete.c:
Added suppression
storage/maria/ma_key_recover.c:
Added suppression
storage/maria/ma_write.c:
Added suppression
strings/ctype-ucs2.c:
Added suppression
support-files/compiler_warnings.supp:
Added suppressions
unittest/mysys/my_vsnprintf-t.c:
Fixed test case with %M to also work on Solaris
Diffstat (limited to 'BUILD')
-rw-r--r-- | BUILD/FINISH.sh | 2 | ||||
-rwxr-xr-x | BUILD/SETUP.sh | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/BUILD/FINISH.sh b/BUILD/FINISH.sh index 1bbc47341c9..37dcd1fe836 100644 --- a/BUILD/FINISH.sh +++ b/BUILD/FINISH.sh @@ -39,7 +39,7 @@ if [ -z "$just_configure" -a -z "$just_clean" ] then commands="$commands -$make $AM_MAKEFLAGS" +$make $AM_MAKEFLAGS $AM_EXTRA_MAKEFLAGS $EXTRA_MAKEFLAGS" if [ "x$strip" = "xyes" ] then diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh index 9f552f1ca5e..de3cb4890a9 100755 --- a/BUILD/SETUP.sh +++ b/BUILD/SETUP.sh @@ -58,6 +58,8 @@ parse_options() EXTRA_CXXFLAGS=`get_key_value "$1"`;; --extra-configs=*) EXTRA_CONFIGS=`get_key_value "$1"`;; + --extra-makeflags=*) + EXTRA_MAKEFLAGS=`get_key_value "$1"`;; -c | --just-configure) just_configure=1;; -n | --just-print | --print) |