diff --git a/include/probes_mysql_nodtrace.h b/include/probes_mysql_nodtrace.h
index e879a06e494..bc3b65a00e5 100644
--- a/include/probes_mysql_nodtrace.h
+++ b/include/probes_mysql_nodtrace.h
@@ -2,125 +2,125 @@
  * Generated by dheadgen(1).
  */
 
-#ifndef        _PROBES_MYSQL_D
-#define        _PROBES_MYSQL_D
+#ifndef	_PROBES_MYSQL_D
+#define	_PROBES_MYSQL_D
 
-#ifdef __cplusplus
+#ifdef	__cplusplus
 extern "C" {
 #endif
 
-#define      MYSQL_CONNECTION_START(arg0, arg1, arg2)
-#define      MYSQL_CONNECTION_START_ENABLED() (0)
-#define      MYSQL_CONNECTION_DONE(arg0, arg1)
-#define      MYSQL_CONNECTION_DONE_ENABLED() (0)
-#define      MYSQL_COMMAND_START(arg0, arg1, arg2, arg3)
-#define      MYSQL_COMMAND_START_ENABLED() (0)
-#define      MYSQL_COMMAND_DONE(arg0)
-#define      MYSQL_COMMAND_DONE_ENABLED() (0)
-#define      MYSQL_QUERY_START(arg0, arg1, arg2, arg3, arg4)
-#define      MYSQL_QUERY_START_ENABLED() (0)
-#define      MYSQL_QUERY_DONE(arg0)
-#define      MYSQL_QUERY_DONE_ENABLED() (0)
-#define      MYSQL_QUERY_PARSE_START(arg0)
-#define      MYSQL_QUERY_PARSE_START_ENABLED() (0)
-#define      MYSQL_QUERY_PARSE_DONE(arg0)
-#define      MYSQL_QUERY_PARSE_DONE_ENABLED() (0)
-#define      MYSQL_QUERY_CACHE_HIT(arg0, arg1)
-#define      MYSQL_QUERY_CACHE_HIT_ENABLED() (0)
-#define      MYSQL_QUERY_CACHE_MISS(arg0)
-#define      MYSQL_QUERY_CACHE_MISS_ENABLED() (0)
-#define      MYSQL_QUERY_EXEC_START(arg0, arg1, arg2, arg3, arg4, arg5)
-#define      MYSQL_QUERY_EXEC_START_ENABLED() (0)
-#define      MYSQL_QUERY_EXEC_DONE(arg0)
-#define      MYSQL_QUERY_EXEC_DONE_ENABLED() (0)
-#define      MYSQL_INSERT_ROW_START(arg0, arg1)
-#define      MYSQL_INSERT_ROW_START_ENABLED() (0)
-#define      MYSQL_INSERT_ROW_DONE(arg0)
-#define      MYSQL_INSERT_ROW_DONE_ENABLED() (0)
-#define      MYSQL_UPDATE_ROW_START(arg0, arg1)
-#define      MYSQL_UPDATE_ROW_START_ENABLED() (0)
-#define      MYSQL_UPDATE_ROW_DONE(arg0)
-#define      MYSQL_UPDATE_ROW_DONE_ENABLED() (0)
-#define      MYSQL_DELETE_ROW_START(arg0, arg1)
-#define      MYSQL_DELETE_ROW_START_ENABLED() (0)
-#define      MYSQL_DELETE_ROW_DONE(arg0)
-#define      MYSQL_DELETE_ROW_DONE_ENABLED() (0)
-#define      MYSQL_READ_ROW_START(arg0, arg1, arg2)
-#define      MYSQL_READ_ROW_START_ENABLED() (0)
-#define      MYSQL_READ_ROW_DONE(arg0)
-#define      MYSQL_READ_ROW_DONE_ENABLED() (0)
-#define      MYSQL_INDEX_READ_ROW_START(arg0, arg1)
-#define      MYSQL_INDEX_READ_ROW_START_ENABLED() (0)
-#define      MYSQL_INDEX_READ_ROW_DONE(arg0)
-#define      MYSQL_INDEX_READ_ROW_DONE_ENABLED() (0)
-#define      MYSQL_HANDLER_RDLOCK_START(arg0, arg1)
-#define      MYSQL_HANDLER_RDLOCK_START_ENABLED() (0)
-#define      MYSQL_HANDLER_WRLOCK_START(arg0, arg1)
-#define      MYSQL_HANDLER_WRLOCK_START_ENABLED() (0)
-#define      MYSQL_HANDLER_UNLOCK_START(arg0, arg1)
-#define      MYSQL_HANDLER_UNLOCK_START_ENABLED() (0)
-#define      MYSQL_HANDLER_RDLOCK_DONE(arg0)
-#define      MYSQL_HANDLER_RDLOCK_DONE_ENABLED() (0)
-#define      MYSQL_HANDLER_WRLOCK_DONE(arg0)
-#define      MYSQL_HANDLER_WRLOCK_DONE_ENABLED() (0)
-#define      MYSQL_HANDLER_UNLOCK_DONE(arg0)
-#define      MYSQL_HANDLER_UNLOCK_DONE_ENABLED() (0)
-#define      MYSQL_FILESORT_START(arg0, arg1)
-#define      MYSQL_FILESORT_START_ENABLED() (0)
-#define      MYSQL_FILESORT_DONE(arg0, arg1)
-#define      MYSQL_FILESORT_DONE_ENABLED() (0)
-#define      MYSQL_SELECT_START(arg0)
-#define      MYSQL_SELECT_START_ENABLED() (0)
-#define      MYSQL_SELECT_DONE(arg0, arg1)
-#define      MYSQL_SELECT_DONE_ENABLED() (0)
-#define      MYSQL_INSERT_START(arg0)
-#define      MYSQL_INSERT_START_ENABLED() (0)
-#define      MYSQL_INSERT_DONE(arg0, arg1)
-#define      MYSQL_INSERT_DONE_ENABLED() (0)
-#define      MYSQL_INSERT_SELECT_START(arg0)
-#define      MYSQL_INSERT_SELECT_START_ENABLED() (0)
-#define      MYSQL_INSERT_SELECT_DONE(arg0, arg1)
-#define      MYSQL_INSERT_SELECT_DONE_ENABLED() (0)
-#define      MYSQL_UPDATE_START(arg0)
-#define      MYSQL_UPDATE_START_ENABLED() (0)
-#define      MYSQL_UPDATE_DONE(arg0, arg1, arg2)
-#define      MYSQL_UPDATE_DONE_ENABLED() (0)
-#define      MYSQL_MULTI_UPDATE_START(arg0)
-#define      MYSQL_MULTI_UPDATE_START_ENABLED() (0)
-#define      MYSQL_MULTI_UPDATE_DONE(arg0, arg1, arg2)
-#define      MYSQL_MULTI_UPDATE_DONE_ENABLED() (0)
-#define      MYSQL_DELETE_START(arg0)
-#define      MYSQL_DELETE_START_ENABLED() (0)
-#define      MYSQL_DELETE_DONE(arg0, arg1)
-#define      MYSQL_DELETE_DONE_ENABLED() (0)
-#define      MYSQL_MULTI_DELETE_START(arg0)
-#define      MYSQL_MULTI_DELETE_START_ENABLED() (0)
-#define      MYSQL_MULTI_DELETE_DONE(arg0, arg1)
-#define      MYSQL_MULTI_DELETE_DONE_ENABLED() (0)
-#define      MYSQL_NET_READ_START()
-#define      MYSQL_NET_READ_START_ENABLED() (0)
-#define      MYSQL_NET_READ_DONE(arg0, arg1)
-#define      MYSQL_NET_READ_DONE_ENABLED() (0)
-#define      MYSQL_NET_WRITE_START(arg0)
-#define      MYSQL_NET_WRITE_START_ENABLED() (0)
-#define      MYSQL_NET_WRITE_DONE(arg0)
-#define      MYSQL_NET_WRITE_DONE_ENABLED() (0)
-#define      MYSQL_KEYCACHE_READ_START(arg0, arg1, arg2, arg3)
-#define      MYSQL_KEYCACHE_READ_START_ENABLED() (0)
-#define      MYSQL_KEYCACHE_READ_BLOCK(arg0)
-#define      MYSQL_KEYCACHE_READ_BLOCK_ENABLED() (0)
-#define      MYSQL_KEYCACHE_READ_HIT()
-#define      MYSQL_KEYCACHE_READ_HIT_ENABLED() (0)
-#define      MYSQL_KEYCACHE_READ_MISS()
-#define      MYSQL_KEYCACHE_READ_MISS_ENABLED() (0)
-#define      MYSQL_KEYCACHE_READ_DONE(arg0, arg1)
-#define      MYSQL_KEYCACHE_READ_DONE_ENABLED() (0)
-#define      MYSQL_KEYCACHE_WRITE_START(arg0, arg1, arg2, arg3)
-#define      MYSQL_KEYCACHE_WRITE_START_ENABLED() (0)
-#define      MYSQL_KEYCACHE_WRITE_BLOCK(arg0)
-#define      MYSQL_KEYCACHE_WRITE_BLOCK_ENABLED() (0)
-#define      MYSQL_KEYCACHE_WRITE_DONE(arg0, arg1)
-#define      MYSQL_KEYCACHE_WRITE_DONE_ENABLED() (0)
+#define	MYSQL_CONNECTION_START(arg0, arg1, arg2)
+#define	MYSQL_CONNECTION_START_ENABLED() (0)
+#define	MYSQL_CONNECTION_DONE(arg0, arg1)
+#define	MYSQL_CONNECTION_DONE_ENABLED() (0)
+#define	MYSQL_COMMAND_START(arg0, arg1, arg2, arg3)
+#define	MYSQL_COMMAND_START_ENABLED() (0)
+#define	MYSQL_COMMAND_DONE(arg0)
+#define	MYSQL_COMMAND_DONE_ENABLED() (0)
+#define	MYSQL_QUERY_START(arg0, arg1, arg2, arg3, arg4)
+#define	MYSQL_QUERY_START_ENABLED() (0)
+#define	MYSQL_QUERY_DONE(arg0)
+#define	MYSQL_QUERY_DONE_ENABLED() (0)
+#define	MYSQL_QUERY_PARSE_START(arg0)
+#define	MYSQL_QUERY_PARSE_START_ENABLED() (0)
+#define	MYSQL_QUERY_PARSE_DONE(arg0)
+#define	MYSQL_QUERY_PARSE_DONE_ENABLED() (0)
+#define	MYSQL_QUERY_CACHE_HIT(arg0, arg1)
+#define	MYSQL_QUERY_CACHE_HIT_ENABLED() (0)
+#define	MYSQL_QUERY_CACHE_MISS(arg0)
+#define	MYSQL_QUERY_CACHE_MISS_ENABLED() (0)
+#define	MYSQL_QUERY_EXEC_START(arg0, arg1, arg2, arg3, arg4, arg5)
+#define	MYSQL_QUERY_EXEC_START_ENABLED() (0)
+#define	MYSQL_QUERY_EXEC_DONE(arg0)
+#define	MYSQL_QUERY_EXEC_DONE_ENABLED() (0)
+#define	MYSQL_INSERT_ROW_START(arg0, arg1)
+#define	MYSQL_INSERT_ROW_START_ENABLED() (0)
+#define	MYSQL_INSERT_ROW_DONE(arg0)
+#define	MYSQL_INSERT_ROW_DONE_ENABLED() (0)
+#define	MYSQL_UPDATE_ROW_START(arg0, arg1)
+#define	MYSQL_UPDATE_ROW_START_ENABLED() (0)
+#define	MYSQL_UPDATE_ROW_DONE(arg0)
+#define	MYSQL_UPDATE_ROW_DONE_ENABLED() (0)
+#define	MYSQL_DELETE_ROW_START(arg0, arg1)
+#define	MYSQL_DELETE_ROW_START_ENABLED() (0)
+#define	MYSQL_DELETE_ROW_DONE(arg0)
+#define	MYSQL_DELETE_ROW_DONE_ENABLED() (0)
+#define	MYSQL_READ_ROW_START(arg0, arg1, arg2)
+#define	MYSQL_READ_ROW_START_ENABLED() (0)
+#define	MYSQL_READ_ROW_DONE(arg0)
+#define	MYSQL_READ_ROW_DONE_ENABLED() (0)
+#define	MYSQL_INDEX_READ_ROW_START(arg0, arg1)
+#define	MYSQL_INDEX_READ_ROW_START_ENABLED() (0)
+#define	MYSQL_INDEX_READ_ROW_DONE(arg0)
+#define	MYSQL_INDEX_READ_ROW_DONE_ENABLED() (0)
+#define	MYSQL_HANDLER_RDLOCK_START(arg0, arg1)
+#define	MYSQL_HANDLER_RDLOCK_START_ENABLED() (0)
+#define	MYSQL_HANDLER_WRLOCK_START(arg0, arg1)
+#define	MYSQL_HANDLER_WRLOCK_START_ENABLED() (0)
+#define	MYSQL_HANDLER_UNLOCK_START(arg0, arg1)
+#define	MYSQL_HANDLER_UNLOCK_START_ENABLED() (0)
+#define	MYSQL_HANDLER_RDLOCK_DONE(arg0)
+#define	MYSQL_HANDLER_RDLOCK_DONE_ENABLED() (0)
+#define	MYSQL_HANDLER_WRLOCK_DONE(arg0)
+#define	MYSQL_HANDLER_WRLOCK_DONE_ENABLED() (0)
+#define	MYSQL_HANDLER_UNLOCK_DONE(arg0)
+#define	MYSQL_HANDLER_UNLOCK_DONE_ENABLED() (0)
+#define	MYSQL_FILESORT_START(arg0, arg1)
+#define	MYSQL_FILESORT_START_ENABLED() (0)
+#define	MYSQL_FILESORT_DONE(arg0, arg1)
+#define	MYSQL_FILESORT_DONE_ENABLED() (0)
+#define	MYSQL_SELECT_START(arg0)
+#define	MYSQL_SELECT_START_ENABLED() (0)
+#define	MYSQL_SELECT_DONE(arg0, arg1)
+#define	MYSQL_SELECT_DONE_ENABLED() (0)
+#define	MYSQL_INSERT_START(arg0)
+#define	MYSQL_INSERT_START_ENABLED() (0)
+#define	MYSQL_INSERT_DONE(arg0, arg1)
+#define	MYSQL_INSERT_DONE_ENABLED() (0)
+#define	MYSQL_INSERT_SELECT_START(arg0)
+#define	MYSQL_INSERT_SELECT_START_ENABLED() (0)
+#define	MYSQL_INSERT_SELECT_DONE(arg0, arg1)
+#define	MYSQL_INSERT_SELECT_DONE_ENABLED() (0)
+#define	MYSQL_UPDATE_START(arg0)
+#define	MYSQL_UPDATE_START_ENABLED() (0)
+#define	MYSQL_UPDATE_DONE(arg0, arg1, arg2)
+#define	MYSQL_UPDATE_DONE_ENABLED() (0)
+#define	MYSQL_MULTI_UPDATE_START(arg0)
+#define	MYSQL_MULTI_UPDATE_START_ENABLED() (0)
+#define	MYSQL_MULTI_UPDATE_DONE(arg0, arg1, arg2)
+#define	MYSQL_MULTI_UPDATE_DONE_ENABLED() (0)
+#define	MYSQL_DELETE_START(arg0)
+#define	MYSQL_DELETE_START_ENABLED() (0)
+#define	MYSQL_DELETE_DONE(arg0, arg1)
+#define	MYSQL_DELETE_DONE_ENABLED() (0)
+#define	MYSQL_MULTI_DELETE_START(arg0)
+#define	MYSQL_MULTI_DELETE_START_ENABLED() (0)
+#define	MYSQL_MULTI_DELETE_DONE(arg0, arg1)
+#define	MYSQL_MULTI_DELETE_DONE_ENABLED() (0)
+#define	MYSQL_NET_READ_START()
+#define	MYSQL_NET_READ_START_ENABLED() (0)
+#define	MYSQL_NET_READ_DONE(arg0, arg1)
+#define	MYSQL_NET_READ_DONE_ENABLED() (0)
+#define	MYSQL_NET_WRITE_START(arg0)
+#define	MYSQL_NET_WRITE_START_ENABLED() (0)
+#define	MYSQL_NET_WRITE_DONE(arg0)
+#define	MYSQL_NET_WRITE_DONE_ENABLED() (0)
+#define	MYSQL_KEYCACHE_READ_START(arg0, arg1, arg2, arg3)
+#define	MYSQL_KEYCACHE_READ_START_ENABLED() (0)
+#define	MYSQL_KEYCACHE_READ_BLOCK(arg0)
+#define	MYSQL_KEYCACHE_READ_BLOCK_ENABLED() (0)
+#define	MYSQL_KEYCACHE_READ_HIT()
+#define	MYSQL_KEYCACHE_READ_HIT_ENABLED() (0)
+#define	MYSQL_KEYCACHE_READ_MISS()
+#define	MYSQL_KEYCACHE_READ_MISS_ENABLED() (0)
+#define	MYSQL_KEYCACHE_READ_DONE(arg0, arg1)
+#define	MYSQL_KEYCACHE_READ_DONE_ENABLED() (0)
+#define	MYSQL_KEYCACHE_WRITE_START(arg0, arg1, arg2, arg3)
+#define	MYSQL_KEYCACHE_WRITE_START_ENABLED() (0)
+#define	MYSQL_KEYCACHE_WRITE_BLOCK(arg0)
+#define	MYSQL_KEYCACHE_WRITE_BLOCK_ENABLED() (0)
+#define	MYSQL_KEYCACHE_WRITE_DONE(arg0, arg1)
+#define	MYSQL_KEYCACHE_WRITE_DONE_ENABLED() (0)
 
 #ifdef  __cplusplus
 }
diff --git a/scripts/dheadgen.pl b/scripts/dheadgen.pl
old mode 100644
new mode 100755
diff --git a/sql/Makefile.am b/sql/Makefile.am
index 95cfa649012..b5efee603f6 100644
--- a/sql/Makefile.am
+++ b/sql/Makefile.am
@@ -29,7 +29,7 @@ libexec_PROGRAMS =	mysqld
 EXTRA_PROGRAMS =	gen_lex_hash
 bin_PROGRAMS =		mysql_tzinfo_to_sql
 DTRACEFILES =           filesort.o \
-			libndb_la-ha_ndbcluster.o \
+			.libs/libndb_la-ha_ndbcluster.o \
                         handler.o \
                         mysqld.o \
                         net_serv.o \
@@ -208,9 +208,9 @@ install-exec-hook:
 
 if HAVE_DTRACE_DASH_G
 libndb_la_LIBADD = probes_all.o
-libndb_la_DEPENDENCIES = probes_all.o dtrace_files dtrace_providers
+libndb_la_DEPENDENCIES = dtrace_files dtrace_providers probes_all.o
 mysqld_LDADD += probes_all.o
-mysqld_DEPENDENCIES += probes_all.o dtrace_files dtrace_providers
+mysqld_DEPENDENCIES += dtrace_files dtrace_providers probes_all.o
 CLEANFILES += dtrace_files dtrace_providers probes_all.o
 DTRACEPROVIDER = $(abs_top_srcdir)/sql/probes_mysql.d
 
@@ -223,7 +223,7 @@ DTRACEDIRS = . ../mysys $(patsubst %,$(top_builddir)/storage/%,@mysql_se_dirs@)
 
 probes_all.o: probes_mysql.d $(DTRACEFILES)
 	providers=`(for i in $(DTRACEDIRS); do cat $$i/dtrace_providers 2>/dev/null; done) | tr " " "\n" | sort | uniq | sed -e '/^$$/d' -e 's/^/-s /'`; \
-	objects=`for i in $(DTRACEDIRS); do f=\`cat $$i/dtrace_files 2>/dev/null\`; for j in $$f; do test -f $$i/$$j && echo -n "$$i/$$j "; done; done`; \
+	objects=`for i in $(DTRACEDIRS); do f=\`cat $$i/dtrace_files 2>/dev/null\`; for j in $$f; do test -f $$i/$$j && echo "$$i/$$j "; done; done`; \
 	$(DTRACE) $(DTRACEFLAGS) -G $$providers $$objects -o $@
 endif