summaryrefslogtreecommitdiff
path: root/BUILD/FINISH.sh
diff options
context:
space:
mode:
authorunknown <knielsen@knielsen-hq.org>2009-12-06 18:34:54 +0100
committerunknown <knielsen@knielsen-hq.org>2009-12-06 18:34:54 +0100
commit961821d7aee482fcf4edb57a98fe9a2d580200ec (patch)
tree1afffd31e7380eed160ae5230aad827a36032f92 /BUILD/FINISH.sh
parentd8e44ef589964a7afc28ffd7c1398be168a9d693 (diff)
downloadmariadb-git-961821d7aee482fcf4edb57a98fe9a2d580200ec.tar.gz
Fix some compiler warnings.
Fix bad merge causing error when specifying test case in non-default suite for mysql-test-run. Implement the ability to add extra flags and configure options when running BUILD/xxx scripts. Improve unclear help text in mysql-test-run BUILD/FINISH.sh: Implement the ability to add extra flags and configure options when running BUILD/xxx scripts. BUILD/SETUP.sh: Implement the ability to add extra flags and configure options when running BUILD/xxx scripts. extra/yassl/taocrypt/include/block.hpp: Fix some compiler warnings. mysql-test/lib/mtr_cases.pm: Fix bad merge causing error when specifying test case in non-default suite for mysql-test-run. Also remove some non-essential differences to mysql version to simplify future merges. mysql-test/mysql-test-run.pl: Improve help texts. plugin/fulltext/plugin_example.c: Fix some compiler warnings. vio/viosslfactories.c: Fix some compiler warnings.
Diffstat (limited to 'BUILD/FINISH.sh')
-rw-r--r--BUILD/FINISH.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/BUILD/FINISH.sh b/BUILD/FINISH.sh
index 142ff7eb08e..75837db320f 100644
--- a/BUILD/FINISH.sh
+++ b/BUILD/FINISH.sh
@@ -1,6 +1,6 @@
-cflags="$c_warnings $extra_flags"
-cxxflags="$cxx_warnings $base_cxxflags $extra_flags"
-extra_configs="$extra_configs $local_infile_configs"
+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"
commands="\