Commit 6c4f9f5d authored by unknown's avatar unknown
Browse files

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

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
parents 20cfd8fd bbe9e857

configure.in

+0 −1
Original line number Diff line number Diff line
@@ -3114,7 +3114,6 @@ AC_CONFIG_FILES(ndb/Makefile ndb/include/Makefile dnl 
   ndb/src/kernel/blocks/qmgr/Makefile dnl

   ndb/src/kernel/blocks/trix/Makefile dnl

   ndb/src/kernel/blocks/backup/Makefile dnl

   ndb/src/kernel/blocks/backup/restore/Makefile dnl

   ndb/src/kernel/blocks/dbutil/Makefile dnl

   ndb/src/kernel/blocks/suma/Makefile dnl

   ndb/src/kernel/blocks/grep/Makefile dnl

ndb/config/type_ndbapitools.mk.am

+2 −1
Original line number Diff line number Diff line
@@ -11,4 +11,5 @@ INCLUDES += -I$(srcdir) -I$(top_srcdir)/include \ 
        -I$(top_srcdir)/ndb/include/util \

        -I$(top_srcdir)/ndb/include/portlib \

        -I$(top_srcdir)/ndb/test/include \

        -I$(top_srcdir)/ndb/include/mgmapi
 
        -I$(top_srcdir)/ndb/include/mgmapi \

        -I$(top_srcdir)/ndb/include/kernel

ndb/src/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -11,8 +11,8 @@ libndbclient_la_LIBADD = \ 
              common/transporter/libtransporter.la   \

              common/debugger/libtrace.la     \

              common/debugger/signaldata/libsignaldataprint.la \

              common/mgmcommon/libmgmsrvcommon.la \

              mgmapi/libmgmapi.la \

              common/mgmcommon/libmgmsrvcommon.la \

              common/logger/liblogger.la       \

              common/portlib/libportlib.la      \

              common/util/libgeneral.la