maria-developers team mailing list archive

[knielsen@xxxxxxxxxxxxxxx]

#At lp:maria

 2802 knielsen@xxxxxxxxxxxxxxx	2010-03-30 [merge]
      automerge for buildbot test
      removed:
        storage/oqgraph/oqgraph_probes.h
      modified:
        storage/oqgraph/Makefile.am

=== modified file 'storage/oqgraph/Makefile.am'
--- a/storage/oqgraph/Makefile.am	2010-01-04 08:27:50 +0000
+++ b/storage/oqgraph/Makefile.am	2010-03-30 18:12:00 +0000
@@ -47,15 +47,15 @@ EXTRA_DIST =	ha_oqgraph.h ha_oqgraph.cc 
 		graphcore-graph.h graphcore-types.h graphcore.h \
 		CMakeFiles.txt plug.in oqgraph_probes.d
 
-DTRACE =                @DTRACE@
-DTRACEFLAGS =           @DTRACEFLAGS@
-DTRACEFILES =           .libs/liboqgraph_engine_la-ha_oqgraph.o
+# DTRACE =                @DTRACE@
+# DTRACEFLAGS =           @DTRACEFLAGS@
+# DTRACEFILES =           .libs/liboqgraph_engine_la-ha_oqgraph.o
 
 ORIG_CXXFLAGS = @CXXFLAGS@
 CXXFLAGS=
 noinst_HEADERS = ha_oqgraph.h \
-		 graphcore-graph.h graphcore-types.h graphcore.h \
-		 oqgraph_probes.h
+		 graphcore-graph.h graphcore-types.h graphcore.h
+#		 oqgraph_probes.h
 
 noinst_LTLIBRARIES = libgraphcore.la
 libgraphcore_la_SOURCES = graphcore.cc
@@ -74,22 +74,22 @@ mysqlplugin_LTLIBRARIES = @plugin_oqgrap
 oqgraph_engine_la_SOURCES = ha_oqgraph.cc
 oqgraph_engine_la_LIBADD = libgraphcore.la
 
-if HAVE_DTRACE
-  oqgraph_engine_la_LIBADD += oqgraph_probes.o
-endif
+# if HAVE_DTRACE
+#   oqgraph_engine_la_LIBADD += oqgraph_probes.o
+# endif
 
 oqgraph_engine_la_LDFLAGS =	-module -rpath $(mysqlplugindir)
 oqgraph_engine_la_CFLAGS = $(ORIG_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
 oqgraph_engine_la_CXXFLAGS = $(ORIG_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN
 
-oqgraph_probes.h: oqgraph_probes.d
-	$(DTRACE) $(DTRACEFLAGS) -h -s oqgraph_probes.d
-	mv oqgraph_probes.h oqgraph_probes.h.bak
-	sed "s/#include <unistd.h>//g" oqgraph_probes.h.bak > oqgraph_probes.h
-	rm oqgraph_probes.h.bak
+# oqgraph_probes.h: oqgraph_probes.d
+# 	$(DTRACE) $(DTRACEFLAGS) -h -s oqgraph_probes.d
+# 	mv oqgraph_probes.h oqgraph_probes.h.bak
+# 	sed "s/#include <unistd.h>//g" oqgraph_probes.h.bak > oqgraph_probes.h
+# 	rm oqgraph_probes.h.bak
 
-oqgraph_probes.o:
-	$(DTRACE) $(DTRACEFLAGS) -G -s oqgraph_probes.d $(DTRACEFILES)
+# oqgraph_probes.o:
+# 	$(DTRACE) $(DTRACEFLAGS) -G -s oqgraph_probes.d $(DTRACEFILES)
 
 endif BUILD_OQGRAPH_FOR_MYSQL
 

=== removed file 'storage/oqgraph/oqgraph_probes.h'
--- a/storage/oqgraph/oqgraph_probes.h	2010-01-04 08:27:50 +0000
+++ b/storage/oqgraph/oqgraph_probes.h	1970-01-01 00:00:00 +0000
@@ -1,45 +0,0 @@
-/*
- * Generated by dtrace(1M).
- */
-
-#ifndef	_OQGRAPH_PROBES_H
-#define	_OQGRAPH_PROBES_H
-
-
-
-#ifdef	__cplusplus
-extern "C" {
-#endif
-
-#if _DTRACE_VERSION
-
-#define	OQGRAPH_CLOSE() \
-	__dtrace_oqgraph___close()
-#define	OQGRAPH_CLOSE_ENABLED() \
-	__dtraceenabled_oqgraph___close()
-#define	OQGRAPH_OPEN() \
-	__dtrace_oqgraph___open()
-#define	OQGRAPH_OPEN_ENABLED() \
-	__dtraceenabled_oqgraph___open()
-
-
-extern void __dtrace_oqgraph___close(void);
-extern int __dtraceenabled_oqgraph___close(void);
-extern void __dtrace_oqgraph___open(void);
-extern int __dtraceenabled_oqgraph___open(void);
-
-#else
-
-#define	OQGRAPH_CLOSE()
-#define	OQGRAPH_CLOSE_ENABLED() (0)
-#define	OQGRAPH_OPEN()
-#define	OQGRAPH_OPEN_ENABLED() (0)
-
-#endif
-
-
-#ifdef	__cplusplus
-}
-#endif
-
-#endif	/* _OQGRAPH_PROBES_H */