10 files changed, 53 insertions, 36 deletions
diff --git a/BUILD/FINISH.sh b/BUILD/FINISH.sh
index 32a4efefdfb..094eb8275d6 100644
--- a/BUILD/FINISH.sh
+++ b/BUILD/FINISH.sh
@@ -23,12 +23,16 @@ autoconf   || (echo \"Can't execute autoconf\"    && exit 1)
 if [ -d gemini ]
 then
    (cd gemini && aclocal && autoheader && aclocal && automake && autoconf)
-fi
+fi"
 
+if [ -z "$just_clean" ]
+then
+commands="$commands
 CFLAGS=\"$cflags\" CXX=\"$CXX\" CXXFLAGS=\"$cxxflags\" CXXLDFLAGS=\"$CXXLDFLAGS\" \
 $configure"
+fi
 
-if [ -z "$just_configure" ]
+if [ -z "$just_configure" -a -z "$just_clean" ]
 then
   commands="$commands
 
@@ -45,7 +49,7 @@ strip sql/mysqld"
   fi
 fi
 
-if test -z "$nonono"
+if test -z "$just_print"
 then
   eval "set -x; $commands"
 else
diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh
index 150f9e28b41..aa6b412d73b 100644
--- a/BUILD/SETUP.sh
+++ b/BUILD/SETUP.sh
@@ -4,13 +4,13 @@ then
   exit 1
 fi
 
-nonono=
+just_print=
 just_configure=
 while test $# -gt 0
 do
   case "$1" in
   -c | --just-configure ) just_configure=1; shift ;;
-  -n | --just-print | --print ) nonono=1; shift ;;
+  -n | --just-print | --print ) just_print=1; shift ;;
   -h | --help ) cat <<EOF; exit 0 ;;
 Usage: $0 [-h|-n] [configure-options]
   -h, --help              Show this help message.
@@ -52,7 +52,7 @@ debug_cflags="-DUNIV_MUST_NOT_INLINE -DEXTRA_DEBUG -DFORCE_INIT_OF_VARS -DSAFEMA
 
 base_cxxflags="-felide-constructors -fno-exceptions -fno-rtti"
 
-base_configs="--prefix=/usr/local/mysql --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client"
+base_configs="--prefix=/usr/local/mysql --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client --with-readline"
 static_link="--with-mysqld-ldflags=-all-static --with-client-ldflags=-all-static"
 alpha_configs=""	# Not used yet
 pentium_configs=""
diff --git a/BUILD/cleanup b/BUILD/cleanup
new file mode 100755
index 00000000000..518c5722d87
--- /dev/null
+++ b/BUILD/cleanup
@@ -0,0 +1,8 @@
+#! /bin/sh
+
+path=`dirname $0`
+. "$path/SETUP.sh"
+
+just_clean=1;
+
+. "$path/FINISH.sh"
diff --git a/BUILD/compile-pentium-debug b/BUILD/compile-pentium-debug
index d8a6b60809b..4a9d0e74599 100755
--- a/BUILD/compile-pentium-debug
+++ b/BUILD/compile-pentium-debug
@@ -6,8 +6,8 @@ path=`dirname $0`
 extra_flags="$pentium_cflags $debug_cflags"
 c_warnings="$c_warnings $debug_extra_warnings"
 cxx_warnings="$cxx_warnings $debug_extra_warnings"
-extra_configs="$pentium_configs $debug_configs $static_link"
+extra_configs="$pentium_configs $debug_configs "
 
-extra_configs="$extra_configs "
+extra_configs="$extra_configs"
 
 . "$path/FINISH.sh"
diff --git a/BUILD/compile-pentium-debug-max b/BUILD/compile-pentium-debug-max
index 1684686ce8c..f8cf19b2132 100755
--- a/BUILD/compile-pentium-debug-max
+++ b/BUILD/compile-pentium-debug-max
@@ -8,6 +8,6 @@ c_warnings="$c_warnings $debug_extra_warnings"
 cxx_warnings="$cxx_warnings $debug_extra_warnings"
 extra_configs="$pentium_configs $debug_configs"
 
-extra_configs="$extra_configs --with-berkeley-db --with-innodb --with-embedded-server --with-openssl"
+extra_configs="$extra_configs --with-berkeley-db --with-innodb --without-isam --with-embedded-server --with-openssl --with-raid"
 
 . "$path/FINISH.sh"
diff --git a/BUILD/compile-pentium-debug-openssl b/BUILD/compile-pentium-debug-openssl
index 5de1c18a5d7..68d99b6eda6 100755
--- a/BUILD/compile-pentium-debug-openssl
+++ b/BUILD/compile-pentium-debug-openssl
@@ -8,6 +8,6 @@ c_warnings="$c_warnings $debug_extra_warnings"
 cxx_warnings="$cxx_warnings $debug_extra_warnings"
 extra_configs="$pentium_configs $debug_configs"
 
-extra_configs="$extra_configs  --with-debug=full --with-vio --with-openssl --without-innodb"
+extra_configs="$extra_configs  --with-debug=full --with-openssl"
 
 . "$path/FINISH.sh"
diff --git a/BUILD/compile-pentium-gcov b/BUILD/compile-pentium-gcov
index 39c0e0591e8..05cb0bb0d78 100755
--- a/BUILD/compile-pentium-gcov
+++ b/BUILD/compile-pentium-gcov
@@ -3,7 +3,7 @@
 path=`dirname $0`
 . "$path/SETUP.sh"
 
-extra_flags="$pentium_cflags -O2 -fprofile-arcs -ftest-coverage -fmessage-length=0 "
+extra_flags="$pentium_cflags  -fprofile-arcs -ftest-coverage"
 extra_configs="$pentium_configs $debug_configs --disable-shared $static_link"
 extra_configs="$extra_configs  --with-innodb --with-berkeley-db"
 
diff --git a/BUILD/compile-pentium-maintainer b/BUILD/compile-pentium-maintainer
new file mode 100755
index 00000000000..1265154dc76
--- /dev/null
+++ b/BUILD/compile-pentium-maintainer
@@ -0,0 +1,13 @@
+#! /bin/sh
+
+path=`dirname $0`
+. "$path/SETUP.sh"
+
+extra_flags="$pentium_cflags $debug_cflags"
+c_warnings="$c_warnings $debug_extra_warnings"
+cxx_warnings="$cxx_warnings $debug_extra_warnings"
+extra_configs="$pentium_configs $debug_configs "
+
+extra_configs="$extra_configs --enable-maintainer-mode"
+
+. "$path/FINISH.sh"
diff --git a/BUILD/compile-pentium-max b/BUILD/compile-pentium-max
index 34a497807df..4563f5ae827 100755
--- a/BUILD/compile-pentium-max
+++ b/BUILD/compile-pentium-max
@@ -3,9 +3,9 @@
 path=`dirname $0`
 . "$path/SETUP.sh"
 
-extra_flags="$pentium_cflags $fast_cflags"
+extra_flags="$pentium_cflags $fast_cflags -g"
 extra_configs="$pentium_configs"
-strip=yes
+#strip=yes
 
 extra_configs="$extra_configs --with-innodb --with-berkeley-db \
 	--with-embedded-server --enable-thread-safe-client \
diff --git a/BUILD/compile-pentium-valgrind-max b/BUILD/compile-pentium-valgrind-max
index 0201001c959..d1c84b93484 100755
--- a/BUILD/compile-pentium-valgrind-max
+++ b/BUILD/compile-pentium-valgrind-max
@@ -1,37 +1,29 @@
 #! /bin/sh
 
-echo "\
-********************************************************************************
-Note that by default BUILD/compile-pentium-valgrind-max calls 'configure' with
---enable-assembler. When Valgrind detects an error involving an assembly
-function (for example an uninitialized value used as an argument of an assembly
-function), Valgrind will not print the stacktrace and 'valgrind
---gdb-attach=yes' will not work either. If you need a stacktrace in those cases,
-you have to run BUILD/compile-pentium-valgrind-max with the --disable-assembler
-argument.
-********************************************************************************
-"
-
 path=`dirname $0`
 . "$path/SETUP.sh"
 
-extra_flags="$pentium_cflags $debug_cflags -USAFEMALLOC -DHAVE_purify"
+extra_flags="$pentium_cflags $debug_cflags -USAFEMALLOC -UFORCE_INIT_OF_VARS -DHAVE_purify"
 c_warnings="$c_warnings $debug_extra_warnings"
 cxx_warnings="$cxx_warnings $debug_extra_warnings"
 extra_configs="$pentium_configs $debug_configs"
 
-extra_configs="$extra_configs --with-berkeley-db --with-innodb --with-embedded-server --with-openssl"
+# We want to test isam when building with valgrind
+extra_configs="$extra_configs --with-berkeley-db --with-innodb --with-isam --with-embedded-server --with-openssl"
 
 . "$path/FINISH.sh"
 
-echo "\
-********************************************************************************
+if test -z "$just_print"
+then
+  set +v +x
+  echo "\
+******************************************************************************
 Note that by default BUILD/compile-pentium-valgrind-max calls 'configure' with
 --enable-assembler. When Valgrind detects an error involving an assembly
-function (for example an uninitialized value used as an argument of an assembly
-function), Valgrind will not print the stacktrace and 'valgrind
---gdb-attach=yes' will not work either. If you need a stacktrace in those cases,
-you have to run BUILD/compile-pentium-valgrind-max with the --disable-assembler
-argument.
-********************************************************************************
-"
+function (for example an uninitialized value used as an argument of an
+assembly function), Valgrind will not print the stacktrace and 'valgrind
+--gdb-attach=yes' will not work either. If you need a stacktrace in those
+cases, you have to run BUILD/compile-pentium-valgrind-max with the
+--disable-assembler argument.
+******************************************************************************"
+fi