#At file:///home/jonas/src/telco-7.1/ based on revid:jonas@stripped
3154 Jonas Oreland 2009-11-13 [merge]
merge 70 to 71
modified:
storage/ndb/src/cw/cpcd/Makefile.am
storage/ndb/test/run-test/Makefile.am
=== modified file 'storage/ndb/src/cw/cpcd/Makefile.am'
--- a/storage/ndb/src/cw/cpcd/Makefile.am 2009-05-27 15:21:45 +0000
+++ b/storage/ndb/src/cw/cpcd/Makefile.am 2009-11-13 09:43:27 +0000
@@ -15,6 +15,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
ndbbin_PROGRAMS = ndb_cpcd
+EXTRA_DIST = CMakeLists.txt
ndb_cpcd_SOURCES = main.cpp CPCD.cpp Process.cpp APIService.cpp Monitor.cpp common.cpp
=== modified file 'storage/ndb/test/run-test/Makefile.am'
--- a/storage/ndb/test/run-test/Makefile.am 2009-10-01 07:16:52 +0000
+++ b/storage/ndb/test/run-test/Makefile.am 2009-11-13 09:43:27 +0000
@@ -52,7 +52,7 @@ atrt_LDFLAGS = -static @ndb_bin_am_ldfla
wrappersdir=$(prefix)/bin
wrappers_SCRIPTS=atrt-testBackup atrt-mysql-test-run
-EXTRA_DIST = $(test_DATA) $(test_SCRIPTS) $(wrappers_SCRIPTS) README.ATRT atrt.hpp
+EXTRA_DIST = $(test_DATA) $(test_SCRIPTS) $(wrappers_SCRIPTS) README.ATRT atrt.hpp CMakeLists.txt
# Don't update the files from bitkeeper
%::SCCS/s.%
Attachment: [text/bzr-bundle] bzr/jonas@mysql.com-20091113123338-pp74xrlee5clx1it.bundle
| Thread |
|---|
| • bzr commit into mysql-5.1-telco-7.1 branch (jonas:3154) | Jonas Oreland | 13 Nov |
