Merge of mysql-5.5-cluster + mysql-trunk into mysql-trunk-cluster

Author: Ole John Aske

.bzrignore

@@ -3048,7 +3048,7 @@ storage/ndb/**/target
 storage/ndb/**/*.class
 storage/ndb/src/ndbjtie/**/*.sh
 storage/ndb/src/ndbjtie/**/*.log
-storage/ndb/src/ndbjtie/jtie/test/myapi/myapi_test
+storage/ndb/src/ndbjtie/**/*_test
 storage/ndb/clusterj/**/*MANIFEST.MF
 storage/ndb/clusterj/**/*manifest.mf
 storage/ndb/test/crund/*.cnf

BUILD/SETUP.sh

@@ -151,7 +151,7 @@ debug_cflags="$debug_cflags -DSAFE_MUTEX"
 error_inject="--with-error-inject "
 #
 # Base C++ flags for all builds
-base_cxxflags="-felide-constructors -fno-exceptions -fno-rtti"
+base_cxxflags="-felide-constructors"
 #
 # Flags for optimizing builds.
 # Be as fast as we can be without losing our ability to backtrace.
@@ -215,7 +215,7 @@ if test -z "$CC" ; then
 fi
 
 if test -z "$CXX" ; then
-  CXX=gcc
+  CXX=g++
 fi
 
 # If ccache (a compiler cache which reduces build time)

BUILD/build_mccge.sh

@@ -431,7 +431,7 @@ extended_usage()
 
     In all cases it is possible to override the definition of CC and CXX
     by calling the script as follows:
-    CC="/usr/local/bin/gcc" CXX="/usr/local/bin/gcc" BUILD/build_mccge.sh
+    CC="/usr/local/bin/gcc" CXX="/usr/local/bin/g++" BUILD/build_mccge.sh
 
   Feedback profiler on gcc
   ------------------------
@@ -1368,10 +1368,10 @@ set_icc_special_options()
 set_cc_and_cxx_for_gcc()
 {
   if test "x$CC" = "x" ; then
-    CC="gcc -static-libgcc -fno-exceptions"
+    CC="gcc -static-libgcc"
   fi
   if test "x$CXX" = "x" ; then
-    CXX="gcc -static-libgcc -fno-exceptions"
+    CXX="g++ -static-libgcc"
   fi
 }
 
@@ -1388,10 +1388,10 @@ set_cc_and_cxx_for_icc()
 set_cc_and_cxx_for_open64()
 {
   if test "x$CC" = "x" ; then
-    CC="opencc -static-libgcc -fno-exceptions"
+    CC="opencc -static-libgcc"
   fi
   if test "x$CXX" = "x" ; then
-    CXX="openCC -static-libgcc -fno-exceptions"
+    CXX="openCC -static-libgcc"
   fi
 }
 
@@ -1689,7 +1689,6 @@ set_solaris_configs()
     fi
     if test "x$cpu_base_type" = "xx86" ; then
       compiler_flags="$compiler_flags -nofstore"
-      base_cxx_flags="$base_cxx_flags -features=no%except"
       if test "x$fast_flag" = "xyes" ; then
         compiler_flags="$compiler_flags -xregs=frameptr"
         compiler_flags="$compiler_flags -xO4"
@@ -1705,7 +1704,6 @@ set_solaris_configs()
 #Using SPARC cpu with SunStudio (Forte) compiler
       ASFLAGS="$ASFLAGS -xarch=sparc"
       LDFLAGS="$LDFLAGS -xarch=sparc"
-      base_cxxflags="$base_cxxflags -noex"
       base_cflags="$base_cflags -xstrconst"
       compiler_flags="$compiler_flags -xarch=sparc"
       if test "x$fast_flag" = "xyes" ; then

BUILD/compile-alpha-debug

@@ -44,11 +44,11 @@ fi
 # Default to gcc for CC and CXX
 if test -z "$CXX" ; then
   export CXX
-  CXX=gcc
+  CXX=g++
   # Set some required compile options
   if test -z "$CXXFLAGS" ; then
     export CXXFLAGS
-    CXXFLAGS="-felide-constructors -fno-exceptions -fno-rtti"
+    CXXFLAGS="-felide-constructors"
   fi
 fi