Commit 7df58b8c authored by unknown's avatar unknown
Browse files

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

into mysql.com:/home/jonas/src/mysql-4.1-ndb


BitKeeper/etc/logging_ok:
  auto-union
parents 40880be3 fd4761df

BitKeeper/etc/logging_ok

+3 −0
Original line number Diff line number Diff line
@@ -100,6 +100,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
@@ -130,6 +131,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
@@ -159,6 +161,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])

ndb/config/type_ndbapitest.mk.am

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ LDADD += $(top_builddir)/ndb/test/src/libNDBT.a \ 
         $(top_builddir)/ndb/src/libndbclient.la \

         $(top_builddir)/dbug/libdbug.a \

         $(top_builddir)/mysys/libmysys.a \

         $(top_builddir)/strings/libmystrings.a

         $(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@



INCLUDES += -I$(srcdir) -I$(top_srcdir)/include \

	-I$(top_srcdir)/ndb/include \

ndb/config/type_ndbapitools.mk.am

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ LDADD += \ 
         $(top_builddir)/ndb/src/libndbclient.la \

         $(top_builddir)/dbug/libdbug.a \

         $(top_builddir)/mysys/libmysys.a \

         $(top_builddir)/strings/libmystrings.a

         $(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@



INCLUDES += -I$(srcdir) -I$(top_srcdir)/include \

	-I$(top_srcdir)/ndb/include \