Commit 580bd979 authored by unknown's avatar unknown
Browse files

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 

into mysql.com:/home/jonas/src/mysql-5.0
parents a1b6bd5a 4c0a0c3e

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"

mysql-test/r/ndb_autodiscover.result

+0 −5
Original line number Diff line number Diff line
@@ -353,11 +353,6 @@ drop table t1; 
use test2;

drop table t2;

drop database test2;

show databases;

Database

information_schema

mysql

test

use test;

drop database if exists test_only_ndb_tables;

create database test_only_ndb_tables;

mysql-test/t/ndb_autodiscover.test

+0 −1
Original line number Diff line number Diff line
@@ -449,7 +449,6 @@ drop table t1; 
use test2;

drop table t2;

drop database test2;

show databases;

use test;



#########################################################