From: Martin Zaun
Date: October 22 2010 8:32am
Subject: bzr push into mysql-5.1-telco-7.1 branch (martin.zaun:3913 to 3914)
List-Archive: http://lists.mysql.com/commits/121656
Message-Id: <201010220832.o9M0xXXZ002783@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1489340568=="

--===============1489340568==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

 3914 Martin Zaun	2010-10-22 [merge]
      crund - merge

    added:
      storage/ndb/test/crund/tws/tws_cpp/Makefile
 3913 Jonas Oreland	2010-10-22 [merge]
      ndb - merge 70 to 71

    modified:
      storage/ndb/tools/restore/consumer_restore.cpp
=== added file 'storage/ndb/test/crund/tws/tws_cpp/Makefile'
--- a/storage/ndb/test/crund/tws/tws_cpp/Makefile	1970-01-01 00:00:00 +0000
+++ b/storage/ndb/test/crund/tws/tws_cpp/Makefile	2010-10-22 08:28:06 +0000
@@ -0,0 +1,85 @@
+#------------------------------------------------------------------------------
+
+# read the generic settings
+include	../../Makefile.defaults
+include	../../env.properties
+
+#------------------------------------------------------------------------------
+
+  DDEFINES 	=
+
+  DELIVERABLES	= TwsDriver 
+
+  GENERATED_H	=
+
+  CLEAN		= core *.o $(GENERATED_H)
+
+  MOSTLYCLEAN	= $(DELIVERABLES) *.dSYM *% log_*
+
+  DISTCLEAN	= *~ *% */*~
+
+  INCLUDES	= -I. -I"$(MARTINS_LITTLE_HELPERS)"	\
+		  $(NDB_INCLUDEOPT0) $(NDB_INCLUDEOPT1)
+
+# for library dependencies, LOADLIBES and LDLIBS have been used historically
+# this convention is used sometimes: use
+#   LDLIBS for project-wide libs (like -lc or -lm)
+#   LOADLIBES for libs for the individual case
+# check with non-gnu makes: use of LOADLIBES, LDLIBS
+  LDLIBS	= -L${NDB_LIBDIR} -lndbclient
+# XXX undefined symbols when linking with 
+#  LOADLIBES	= -L$(MARTINS_LITTLE_HELPERS) -lutils
+# XXX which seems to be the same as
+#  LOADLIBES	= $(MARTINS_LITTLE_HELPERS)/libutils.dylib
+# XXX but linking statically is fine:
+#  LOADLIBES	= $(MARTINS_LITTLE_HELPERS)/libutils.a
+
+#------------------------------------------------------------------------------
+
+.PHONY:	all help depend dep dbg opt prf clean mostlyclean distclean \
+	run.driver valgrind.driver
+
+all:	$(DELIVERABLES)
+
+help:
+	@echo "build targets:"
+	@echo "  dep            -- build the include dependencies"
+	@echo "  dbg            -- build all targets with debug flags"
+	@echo "  opt            -- build all targets with optimizing flags"
+	@echo "  prf            -- build all targets with profiling flags"
+	@echo ""
+	@echo "clean targets:"
+	@echo "  clean          -- delete temporary files"
+	@echo "  mostlyclean    -- also delete all generated files"
+	@echo "  distclean      -- delete also database and server log files"
+	@echo ""
+	@echo "run targets:"
+	@echo "  run.driver     -- run the benchmark's driver program"
+	@echo "  grind.driver   -- run the driver with valgrind memchecker"
+	@echo ""
+
+dep depend:	$(GENERATED_H)
+
+run.driver:	TwsDriver
+	./TwsDriver \
+	-p ../run.properties
+
+# for JVM processes, try running valgrind with
+# --smc-check=all --trace-children=yes --leak-check=full --show-reachable=yes
+grind.driver:	TwsDriver
+	valgrind \
+	--leak-check=full --show-reachable=yes --trace-children=yes \
+	./TwsDriver \
+	-p ../run.properties
+
+TwsDriver:	Driver.o NdbApiTwsDriver.o
+
+#------------------------------------------------------------------------------
+
+.depend:
+	touch $@
+
+# read local dependencies
+-include	.depend
+
+#------------------------------------------------------------------------------


--===============1489340568==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/martin.zaun@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: martin.zaun@stripped
# target_branch: file:///Users/mz/mysql/ndb-7.1/
# testament_sha1: 1f802395dbcdba31ffdc6bfffe5316a5b3b19742
# timestamp: 2010-10-22 01:32:08 -0700
# source_branch: file:///Users/mz/mysql/ndb-7.1-opt1/
# base_revision_id: jonas@stripped
# 
# Begin bundle
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
7O/r8D/i7kinChIHwH6lQA==


--===============1489340568==--