Commit 4c0a0c3e authored by unknown's avatar unknown
Browse files

moved START_AND_EXIT check so it can actually be used 

fix as not to overwrite previoulsy set flags in configure


config/ac-macros/ha_ndbcluster.m4:
  fix as not to overwrite previoulsy set flags in configure
configure.in:
  fix as not to overwrite previoulsy set flags in configure
mysql-test/mysql-test-run.sh:
  movet START_AND_EXIT check so it can actually be used
parent 43abffc8

config/ac-macros/ha_ndbcluster.m4

+2 −2
Original line number Diff line number Diff line
@@ -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([])

configure.in

+1 −0
Original line number Diff line number Diff line
@@ -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)

mysql-test/mysql-test-run.sh

+6 −4
Original line number Diff line number Diff line
@@ -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"