Commit 34ac282e authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/bk/mysql-4.1 

into mysql.com:/users/kboortz/daily/work/mysql-4.1-es


mysql-test/mysql-test-run.sh:
  Auto merged
parents 886cb240 72ae79c3

BitKeeper/etc/logging_ok

+3 −0
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ miguel@hegel.txg.br 
miguel@light.

miguel@light.local

miguel@sartre.local

mikael@mc04.(none)

mikron@c-fb0ae253.1238-1-64736c10.cust.bredbandsbolaget.se

mikron@mikael-ronstr-ms-dator.local

mleich@mysql.com
@@ -132,6 +133,7 @@ mwagner@here.mwagner.org 
mwagner@work.mysql.com

mydev@mysql.com

mysql@home.(none)

mysql@mc04.(none)

mysqldev@build.mysql2.com

mysqldev@melody.local

mysqldev@mysql.com
@@ -161,6 +163,7 @@ ram@ram.(none) 
ranger@regul.home.lan

rburnett@build.mysql.com

root@home.(none)

root@mc04.(none)

root@x3.internalnet

salle@banica.(none)

salle@geopard.(none)

acinclude.m4

+32 −18
Original line number Diff line number Diff line
@@ -1548,16 +1548,43 @@ dnl Sets HAVE_NDBCLUSTER_DB if --with-ndbcluster is used 
dnl ---------------------------------------------------------------------------

                                                                                

AC_DEFUN([MYSQL_CHECK_NDB_OPTIONS], [

  AC_ARG_WITH([ndb-sci],

              AC_HELP_STRING([--with-ndb-sci=DIR],

                             [Provide MySQL with a custom location of

                             sci library. Given DIR, sci library is 

                             assumed to be in $DIR/lib and header files

                             in $DIR/include.]),

              [mysql_sci_dir=${withval}],

              [mysql_sci_dir=""])



  case "$mysql_sci_dir" in

    "no" )

      have_ndb_sci=no

      AC_MSG_RESULT([-- not including sci transporter])

      ;;

    * )

      if test -f "$mysql_sci_dir/lib/libsisci.a" -a \ 

              -f "$mysql_sci_dir/include/sisci_api.h"; then

        NDB_SCI_INCLUDES="-I$mysql_sci_dir/include"

        NDB_SCI_LIBS="-L$mysql_sci_dir/lib -lsisci"

        AC_MSG_RESULT([-- including sci transporter])

        AC_DEFINE([NDB_SCI_TRANSPORTER], [1],

                  [Including Ndb Cluster DB sci transporter])

        AC_SUBST(NDB_SCI_INCLUDES)

        AC_SUBST(NDB_SCI_LIBS)

        have_ndb_sci="yes"

        AC_MSG_RESULT([found sci transporter in $mysql_sci_dir/{include, lib}])

      else

        AC_MSG_RESULT([could not find sci transporter in $mysql_sci_dir/{include, lib}])

      fi

      ;;

  esac



  AC_ARG_WITH([ndb-shm],

              [

  --with-ndb-shm        Include the NDB Cluster shared memory transporter],

              [ndb_shm="$withval"],

              [ndb_shm=no])

  AC_ARG_WITH([ndb-sci],

              [

  --with-ndb-sci        Include the NDB Cluster sci transporter],

              [ndb_sci="$withval"],

              [ndb_sci=no])

  AC_ARG_WITH([ndb-test],

              [

  --with-ndb-test       Include the NDB Cluster ndbapi test programs],
@@ -1590,19 +1617,6 @@ AC_DEFUN([MYSQL_CHECK_NDB_OPTIONS], [ 
      ;;

  esac



  have_ndb_sci=no

  case "$ndb_sci" in

    yes )

      AC_MSG_RESULT([-- including sci transporter])

      AC_DEFINE([NDB_SCI_TRANSPORTER], [1],

                [Including Ndb Cluster DB sci transporter])

      have_ndb_sci="yes"

      ;;

    * )

      AC_MSG_RESULT([-- not including sci transporter])

      ;;

  esac



  have_ndb_test=no

  case "$ndb_test" in

    yes )

configure.in

+2 −2
Original line number Diff line number Diff line
@@ -3024,11 +3024,11 @@ AC_SUBST([ndb_port_base]) 
ndb_transporter_opt_objs=""

if test X"$have_ndb_shm" = Xyes

then

  ndb_transporter_opt_objs="$(ndb_transporter_opt_objs) SHM_Transporter.lo SHM_Transporter.unix.lo"

  ndb_transporter_opt_objs="$ndb_transporter_opt_objs SHM_Transporter.lo SHM_Transporter.unix.lo"

fi

if test X"$have_ndb_sci" = Xyes

then

  ndb_transporter_opt_objs="$(ndb_transporter_opt_objs) SCI_Transporter.lo"

  ndb_transporter_opt_objs="$ndb_transporter_opt_objs SCI_Transporter.lo"

fi

AC_SUBST([ndb_transporter_opt_objs])

mysql-test/mysql-test-run.sh

+19 −3
Original line number Diff line number Diff line
@@ -299,6 +299,11 @@ while test $# -gt 0; do 
    --record)

      RECORD=1;

      EXTRA_MYSQL_TEST_OPT="$EXTRA_MYSQL_TEST_OPT $1" ;;

    --small-bench)

      DO_SMALL_BENCH=1

      DO_BENCH=1

      NO_SLAVE=1

      ;;

    --bench)

      DO_BENCH=1

      NO_SLAVE=1
@@ -1546,7 +1551,13 @@ then 
  if [ -z "$USE_RUNNING_NDBCLUSTER" ]

  then

    echo "Starting ndbcluster"

    ./ndb/ndbcluster --port-base=$NDBCLUSTER_PORT --small --diskless --initial --data-dir=$MYSQL_TEST_DIR/var || exit 1

    if [ "$DO_BENCH" = 1 ]

    then

      NDBCLUSTER_OPTS=""

    else

      NDBCLUSTER_OPTS="--small"

    fi

    ./ndb/ndbcluster --port-base=$NDBCLUSTER_PORT $NDBCLUSTER_OPTS --diskless --initial --data-dir=$MYSQL_TEST_DIR/var || exit 1

    USE_NDBCLUSTER="$USE_NDBCLUSTER --ndb-connectstring=\"host=localhost:$NDBCLUSTER_PORT\""

  else

    USE_NDBCLUSTER="$USE_NDBCLUSTER --ndb-connectstring=\"$USE_RUNNING_NDBCLUSTER\""
@@ -1580,9 +1591,14 @@ if [ "$DO_BENCH" = 1 ] 
then

  start_master



  if [ "$DO_SMALL_BENCH" = 1 ]

  then

    EXTRA_BENCH_ARGS="--small-test --small-tables"

  fi



  if [ ! -z "$USE_NDBCLUSTER" ]

  then

    EXTRA_BENCH_ARGS="--create-options=TYPE=ndb"

    EXTRA_BENCH_ARGS="--create-options=TYPE=ndb $EXTRA_BENCH_ARGS"

  fi 



  BENCHDIR=$BASEDIR/sql-bench/
@@ -1590,7 +1606,7 @@ then 
  cd $BENCHDIR

  if [ -z "$1" ]

  then

    ./run-all-tests --socket=$MASTER_MYSOCK --user=root $EXTRA_BENCH_ARGS

    ./run-all-tests --socket=$MASTER_MYSOCK --user=root $EXTRA_BENCH_ARGS --log

  else

    if [ -x "./$1" ]

    then

mysql-test/ndb/ndb_config_2_node.ini

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ IndexMemory= CHOOSE_IndexMemory 
Diskless= CHOOSE_Diskless

TimeBetweenWatchDogCheck= 30000

DataDir= CHOOSE_FILESYSTEM

MaxNoOfOrderedIndexes= CHOOSE_MaxNoOfOrderedIndexes



[ndbd]

HostName= CHOOSE_HOSTNAME_1