Commit 481b314e authored by tomas@whalegate.ndb.mysql.com's avatar tomas@whalegate.ndb.mysql.com
Browse files

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

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
parents b3a84ddd 709cfbc1

BUILD/Makefile.am

+2 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ EXTRA_DIST = FINISH.sh \ 
			compile-alpha-debug \

			compile-amd64-debug-max \

			compile-amd64-max \

			compile-amd64-max-sci \

			compile-darwin-mwcc \

			compile-dist \

			compile-hpux11-parisc2-aCC \
@@ -53,6 +54,7 @@ EXTRA_DIST = FINISH.sh \ 
			compile-pentium-valgrind-max \

			compile-pentium64-debug \

			compile-pentium64-debug-max \

			compile-pentium64-max-sci \

			compile-pentium64-valgrind-max \

			compile-ppc \

			compile-ppc-debug \

BUILD/compile-amd64-max-sci

0 → 100644
+8 −0
Original line number Diff line number Diff line 
#! /bin/sh



path=`dirname $0`

. "$path/SETUP.sh"

extra_flags="$amd64_cflags $fast_cflags -g"

extra_configs="$amd64_configs $max_configs --with-ndb-sci=/opt/DIS"



. "$path/FINISH.sh"

BUILD/compile-pentium64-max-sci

0 → 100644
+9 −0
Original line number Diff line number Diff line 
#! /bin/sh



path=`dirname $0`

. "$path/SETUP.sh"



extra_flags="$pentium64_cflags $fast_cflags -g"

extra_configs="$pentium_configs $max_configs --with-ndb-sci=/opt/DIS"



. "$path/FINISH.sh"

config/ac-macros/ha_ndbcluster.m4

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ AC_DEFUN([MYSQL_CHECK_NDB_OPTIONS], [ 
      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"

        NDB_SCI_LIBS="$mysql_sci_dir/lib/libsisci.a"

        AC_MSG_RESULT([-- including sci transporter])

        AC_DEFINE([NDB_SCI_TRANSPORTER], [1],

                  [Including Ndb Cluster DB sci transporter])

libmysqld/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ INC_LIB= $(top_builddir)/regex/libregex.a \ 
		$(top_builddir)/mysys/libmysys.a \

		$(top_builddir)/strings/libmystrings.a \

		$(top_builddir)/dbug/libdbug.a \

		$(top_builddir)/vio/libvio.a

		$(top_builddir)/vio/libvio.a @NDB_SCI_LIBS@





#