mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-27 01:04:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0

Browse source 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
This commit is contained in:
unknown 2005-01-21 09:46:08 +01:00
commit 45c4c8bbe9
3 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
config/ac-macros/ha_ndbcluster.m4
View file

@ -64,8 +64,8 @@ AC_DEFUN([MYSQL_CHECK_NDB_OPTIONS], [
AC_ARG_WITH([ndb-ccflags], AC_ARG_WITH([ndb-ccflags],
[ [
--with-ndb-ccflags Extra CC options for ndb compile], --with-ndb-ccflags Extra CC options for ndb compile],
[ndb_cxxflags_fix=$withval], [ndb_cxxflags_fix="$ndb_cxxflags_fix $withval"],
[ndb_cxxflags_fix=]) [ndb_cxxflags_fix=$ndb_cxxflags_fix])
AC_MSG_CHECKING([for NDB Cluster options]) AC_MSG_CHECKING([for NDB Cluster options])
AC_MSG_RESULT([]) AC_MSG_RESULT([])

1
configure.in
View file

@ -962,6 +962,7 @@ esac
MAX_C_OPTIMIZE="-O3" MAX_C_OPTIMIZE="-O3"
MAX_CXX_OPTIMIZE="-O3" MAX_CXX_OPTIMIZE="-O3"
ndb_cxxflags_fix=
case $SYSTEM_TYPE-$MACHINE_TYPE-$ac_cv_prog_gcc in case $SYSTEM_TYPE-$MACHINE_TYPE-$ac_cv_prog_gcc in
# workaround for Sun Forte/x86 see BUG#4681 # workaround for Sun Forte/x86 see BUG#4681
*solaris*-i?86-no) *solaris*-i?86-no)

10
mysql-test/mysql-test-run.sh
View file

@ -1547,6 +1547,12 @@ run_testcase ()
fi fi
fi fi
fi fi
if [ "x$START_AND_EXIT" = "x1" ] ; then
echo "Servers started, exiting"
exit
fi
cd $MYSQL_TEST_DIR cd $MYSQL_TEST_DIR
if [ -f $tf ] ; then if [ -f $tf ] ; then
@ -1682,10 +1688,6 @@ then
mysql_loadstd mysql_loadstd
fi fi
if [ "x$START_AND_EXIT" = "x1" ] ; then
echo "Servers started, exiting"
exit
fi
$ECHO "Starting Tests" $ECHO "Starting Tests"