Merge mysql.com:/home/bk/mysql-5.0 into mysql.com:/home/bk/mysql-5.1

BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
BUILD/FINISH.sh:
  Auto merged
BUILD/compile-dist:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
storage/ndb/src/cw/cpcd/Process.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
  Auto merged
storage/ndb/src/kernel/error/ErrorReporter.cpp:
  Auto merged
storage/ndb/src/ndbapi/Ndb.cpp:
  Auto merged

2 files changed, 5 insertions, 6 deletions

diff --git a/BUILD/FINISH.sh b/BUILD/FINISH.sh
index ae0518c150d..9745233e5d1 100644
--- a/BUILD/FINISH.sh
+++ b/BUILD/FINISH.sh
@@ -2,12 +2,6 @@ cflags="$c_warnings $extra_flags"
 cxxflags="$cxx_warnings $base_cxxflags $extra_flags"
 extra_configs="$extra_configs $local_infile_configs"
 configure="./configure $base_configs $extra_configs"
-for arg
-do
-  # Escape special characters so they don't confuse eval
-  configure="$configure "`echo "$arg" | \
-  		sed -e 's,\([^a-zA-Z0-9_.=-]\),\\\\\1,g'`
-done
 
 commands="\
 $make -k distclean || true 
diff --git a/BUILD/compile-dist b/BUILD/compile-dist
index 248f4bb04ce..a8d180eace1 100755
--- a/BUILD/compile-dist
+++ b/BUILD/compile-dist
@@ -18,12 +18,17 @@ autoconf
 # Default to gcc for CC and CXX
 if test -z "$CXX" ; then
   export CXX=gcc
+  # Set some required compile options
+  if test -z "$CXXFLAGS" ; then
+    export CXXFLAGS="-felide-constructors -fno-exceptions -fno-rtti"
+  fi
 fi
 
 if test -z "$CC" ; then
   export CC=gcc
 fi
 
+
 # Use ccache, if available
 if ccache -V > /dev/null 2>&1
 then