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

into poseidon.bredbandsbolaget.se:/home/tomas/mysql-4.1-ndb

BitKeeper/etc/logging_ok

@@ -166,6 +166,7 @@ tim@work.mysql.com
 tom@basil-firewall.home.com
 tomas@mc05.(none)
 tomas@poseidon.(none)
+tomas@poseidon.bredbandsbolaget.se
 tonu@hundin.mysql.fi
 tonu@volk.internalnet
 tonu@x153.internalnet

acinclude.m4

@@ -1341,39 +1341,42 @@ AC_DEFUN([MYSQL_CHECK_NDB_OPTIONS], [
   AC_ARG_WITH([ndb-shm],
               [
   --with-ndb-shm        Include the NDB Cluster shared memory transporter],
-              [ndb-shm="$withval"],
-              [ndb-shm=no])
+              [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])
+              [ndb_sci="$withval"],
+              [ndb_sci=no])
                                                                                 
   AC_MSG_CHECKING([for NDB Cluster options])
+  AC_MSG_RESULT([])
                                                                                 
   have_ndb_shm=no
-  case "$ndb-shm" in
+  case "$ndb_shm" in
     yes )
-      AC_MSG_RESULT([Including NDB Cluster shared memory transporter])
+      AC_MSG_RESULT([-- including shared memory transporter])
       AC_DEFINE(NDB_SHM_TRANSPORTER)
       have_ndb_shm="yes"
       ;;
     * )
-      AC_MSG_RESULT([Not including NDB Cluster shared memory transporter])
+      AC_MSG_RESULT([-- not including shared memory transporter])
       ;;
   esac
 
   have_ndb_sci=no
-  case "$ndb-sci" in
+  case "$ndb_sci" in
     yes )
-      AC_MSG_RESULT([Including NDB Cluster sci transporter])
+      AC_MSG_RESULT([-- including sci transporter])
       AC_DEFINE(NDB_SCI_TRANSPORTER)
       have_ndb_sci="yes"
       ;;
     * )
-      AC_MSG_RESULT([Not including NDB Cluster sci transporter])
+      AC_MSG_RESULT([-- not including sci transporter])
       ;;
   esac
+
+  AC_MSG_RESULT([done.])
 ])
 
 AC_DEFUN([MYSQL_CHECK_NDBCLUSTER], [
@@ -1396,6 +1399,7 @@ AC_DEFUN([MYSQL_CHECK_NDBCLUSTER], [
       ndbcluster_includes="-I../ndb/include -I../ndb/include/ndbapi"
       ndbcluster_libs="\$(top_builddir)/ndb/src/libndbclient.la"
       ndbcluster_system_libs=""
+      MYSQL_CHECK_NDB_OPTIONS
       ;;
     * )
       AC_MSG_RESULT([Not using NDB Cluster])

configure.in

@@ -2919,6 +2919,9 @@ AC_SUBST(mgmapiincludedir)
   AC_SUBST(NDB_NDBAPICLIENT_INCLUDES)
   AC_SUBST(NDB_MGMAPICLIENT_INCLUDES)
 
+AM_CONDITIONAL(HAVE_NDB_SHM, test X"$have_ndb_shm" = Xyes)
+AM_CONDITIONAL(HAVE_NDB_SCI, test X"$have_ndb_sci" = Xyes)
+
   #NDB_TYPE_COMMON="include \$(top_srcdir)/ndb/config/common.mk.am"
   #NDB_TYPE_NDBAPI="include \$(top_srcdir)/ndb/config/type_ndbapi.mk.am"
   #NDB_TYPE_NDBAPI="include \$(top_srcdir)/ndb/config/type_ndbapitest.mk.am"

ndb/src/common/transporter/Makefile.am

@@ -8,7 +8,13 @@ libtransporter_la_SOURCES = \
 	TransporterRegistry.cpp \
         Packer.cpp
 
-#	SHM_Transporter.cpp
+if HAVE_NDB_SHM
+  libtransporter_la_SOURCES += SHM_Transporter.cpp SHM_Transporter.unix.cpp
+endif
+
+if HAVE_NDB_SCI
+  libtransporter_la_SOURCES += SCI_Transporter.cpp
+endif
 
 INCLUDES_LOC = -I$(top_srcdir)/ndb/include/kernel -I$(top_srcdir)/ndb/include/transporter