diff --git a/config/ac-macros/ha_ndbcluster.m4 b/config/ac-macros/ha_ndbcluster.m4
index 751a11d1895..dc5e0e73558 100644
--- a/config/ac-macros/ha_ndbcluster.m4
+++ b/config/ac-macros/ha_ndbcluster.m4
@@ -64,8 +64,8 @@ AC_DEFUN([MYSQL_CHECK_NDB_OPTIONS], [
   AC_ARG_WITH([ndb-ccflags],
               [
   --with-ndb-ccflags    Extra CC options for ndb compile],
-              [ndb_cxxflags_fix=$withval],
-              [ndb_cxxflags_fix=])
+              [ndb_cxxflags_fix="$ndb_cxxflags_fix $withval"],
+              [ndb_cxxflags_fix=$ndb_cxxflags_fix])
 
   AC_MSG_CHECKING([for NDB Cluster options])
   AC_MSG_RESULT([])
diff --git a/configure.in b/configure.in
index e20edf97a72..3a0a2aa9c9d 100644
--- a/configure.in
+++ b/configure.in
@@ -962,6 +962,7 @@ esac
 MAX_C_OPTIMIZE="-O3"
 MAX_CXX_OPTIMIZE="-O3"
 
+ndb_cxxflags_fix=
 case $SYSTEM_TYPE-$MACHINE_TYPE-$ac_cv_prog_gcc in
 # workaround for Sun Forte/x86 see BUG#4681
   *solaris*-i?86-no)
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh
index a6cbea2d1e5..037fdb28199 100644
--- a/mysql-test/mysql-test-run.sh
+++ b/mysql-test/mysql-test-run.sh
@@ -1547,6 +1547,12 @@ run_testcase ()
      fi
    fi
  fi
+
+ if [ "x$START_AND_EXIT" = "x1" ] ; then
+  echo "Servers started, exiting"
+  exit
+ fi
+
  cd $MYSQL_TEST_DIR
 
  if [ -f $tf ] ; then
@@ -1682,10 +1688,6 @@ then
   mysql_loadstd
 fi
 
-if [ "x$START_AND_EXIT" = "x1" ] ; then
- echo "Servers started, exiting"
- exit
-fi
 
 $ECHO  "Starting Tests"