diff options
| author | unknown <knielsen@knielsen-hq.org> | 2010-03-30 20:12:00 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2010-03-30 20:12:00 +0200 |
| commit | da44736a9d0b6b7d75bd4d1fbc7bc946b975c6a5 (patch) | |
| tree | 4a71f901a6cfef9705e70ad029cc95f8ad9161ec /storage/oqgraph | |
| parent | 5a3b3d9afb6233ff785eab2a9679374ae274a75c (diff) | |
| download | mariadb-git-da44736a9d0b6b7d75bd4d1fbc7bc946b975c6a5.tar.gz | |
Comment out dtrace stuff for now, as it does not work properly on systems that lack dtrace.
Remove generated header from bzr
Diffstat (limited to 'storage/oqgraph')
| -rw-r--r-- | storage/oqgraph/Makefile.am | 30 | ||||
| -rw-r--r-- | storage/oqgraph/oqgraph_probes.h | 45 |
2 files changed, 15 insertions, 60 deletions
diff --git a/storage/oqgraph/Makefile.am b/storage/oqgraph/Makefile.am index 727f92ceb25..3050313e985 100644 --- a/storage/oqgraph/Makefile.am +++ b/storage/oqgraph/Makefile.am @@ -47,15 +47,15 @@ EXTRA_DIST = ha_oqgraph.h ha_oqgraph.cc graphcore.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_oqgraph_shared_target@ 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 diff --git a/storage/oqgraph/oqgraph_probes.h b/storage/oqgraph/oqgraph_probes.h deleted file mode 100644 index 5169ccf320a..00000000000 --- a/storage/oqgraph/oqgraph_probes.h +++ /dev/null @@ -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 */ |