Commit 67c65a66 authored by unknown's avatar unknown

Merge knielsen.mysql.internal:/usr/local/mysql/mysql-4.1

into  bk-internal.mysql.com:/tmp/knielsen/mysql-5.0-maint


ndb/config/common.mk.am:
  Null merge.
ndb/src/common/portlib/Makefile.am:
  Null merge.
ndb/src/kernel/Makefile.am:
  Null merge.
parents 1ec54154 a5a48382
...@@ -3,7 +3,7 @@ LDADD += \ ...@@ -3,7 +3,7 @@ LDADD += \
$(top_builddir)/ndb/src/libndbclient.la \ $(top_builddir)/ndb/src/libndbclient.la \
$(top_builddir)/dbug/libdbug.a \ $(top_builddir)/dbug/libdbug.a \
$(top_builddir)/mysys/libmysys.a \ $(top_builddir)/mysys/libmysys.a \
$(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@ $(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@ -lmygcc
INCLUDES += -I$(srcdir) -I$(top_srcdir)/include \ INCLUDES += -I$(srcdir) -I$(top_srcdir)/include \
-I$(top_srcdir)/ndb/include \ -I$(top_srcdir)/ndb/include \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment