3127 Magnus Blåudd 2009-10-31 [merge]
Merge 7.0 -> 7.1
modified:
storage/ndb/config/type_ndbapitools.mk.am
3126 Jonas Oreland 2009-10-30 [merge]
merge 70 to 71
modified:
storage/ndb/src/kernel/blocks/ERROR_codes.txt
storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
storage/ndb/test/ndbapi/testSystemRestart.cpp
storage/ndb/test/run-test/daily-basic-tests.txt
=== modified file 'storage/ndb/config/type_ndbapitools.mk.am'
--- a/storage/ndb/config/type_ndbapitools.mk.am 2009-05-27 12:11:46 +0000
+++ b/storage/ndb/config/type_ndbapitools.mk.am 2009-10-31 16:00:17 +0000
@@ -16,9 +16,7 @@
LDADD += \
$(top_builddir)/storage/ndb/src/libndbclient.la \
- $(top_builddir)/dbug/libdbuglt.la \
- $(top_builddir)/mysys/libmysyslt.la \
- $(top_builddir)/strings/libmystringslt.la @NDB_SCI_LIBS@ @ZLIB_LIBS@
+ @NDB_SCI_LIBS@ @ZLIB_LIBS@
INCLUDES += -I$(srcdir) \
-I$(top_builddir)/include \
Attachment: [text/bzr-bundle] bzr/magnus.blaudd@sun.com-20091031160129-cct6dv6td9mueyoc.bundle
| Thread |
|---|
| • bzr push into mysql-5.1-telco-7.1 branch (magnus.blaudd:3126 to 3127) | Magnus Blåudd | 31 Oct |
