Commit 806cf36b authored by Mikael Ronstrom's avatar Mikael Ronstrom

A number of fixes to DTrace patch

Removed instance manager from builds
parent a259667b
...@@ -248,7 +248,6 @@ IF(WITH_INNOBASE_STORAGE_ENGINE) ...@@ -248,7 +248,6 @@ IF(WITH_INNOBASE_STORAGE_ENGINE)
ADD_SUBDIRECTORY(storage/innobase) ADD_SUBDIRECTORY(storage/innobase)
ENDIF(WITH_INNOBASE_STORAGE_ENGINE) ENDIF(WITH_INNOBASE_STORAGE_ENGINE)
ADD_SUBDIRECTORY(sql) ADD_SUBDIRECTORY(sql)
ADD_SUBDIRECTORY(server-tools/instance-manager)
ADD_SUBDIRECTORY(libmysql) ADD_SUBDIRECTORY(libmysql)
ADD_SUBDIRECTORY(tests) ADD_SUBDIRECTORY(tests)
IF(WITH_EMBEDDED_SERVER) IF(WITH_EMBEDDED_SERVER)
......
...@@ -27,7 +27,7 @@ SUBDIRS = . include @docs_dirs@ @zlib_dir@ \ ...@@ -27,7 +27,7 @@ SUBDIRS = . include @docs_dirs@ @zlib_dir@ \
@sql_union_dirs@ unittest storage plugin \ @sql_union_dirs@ unittest storage plugin \
@sql_server@ @man_dirs@ tests \ @sql_server@ @man_dirs@ tests \
netware @libmysqld_dirs@ \ netware @libmysqld_dirs@ \
mysql-test support-files sql-bench @tools_dirs@ \ mysql-test support-files sql-bench \
win win
DIST_SUBDIRS = . include Docs zlib \ DIST_SUBDIRS = . include Docs zlib \
...@@ -36,7 +36,7 @@ DIST_SUBDIRS = . include Docs zlib \ ...@@ -36,7 +36,7 @@ DIST_SUBDIRS = . include Docs zlib \
strings mysys dbug extra regex libmysql libmysql_r client unittest storage plugin \ strings mysys dbug extra regex libmysql libmysql_r client unittest storage plugin \
vio sql man tests \ vio sql man tests \
netware libmysqld \ netware libmysqld \
mysql-test support-files sql-bench server-tools \ mysql-test support-files sql-bench \
win \ win \
BUILD BUILD
DISTCLEANFILES = ac_available_languages_fragment DISTCLEANFILES = ac_available_languages_fragment
......
...@@ -2507,19 +2507,6 @@ then ...@@ -2507,19 +2507,6 @@ then
[Access checks in embedded library]) [Access checks in embedded library])
fi fi
tools_dirs=""
AC_ARG_WITH([mysqlmanager],
AC_HELP_STRING([--with-mysqlmanager], [Build the mysqlmanager binary: yes/no (default: build if server is built.)]),,)
if test "$with_mysqlmanager" = "yes" -o \
'(' "$with_mysqlmanager:$with_server" = ":yes" -a \
-d "$srcdir/server-tools" ')' ; then
tools_dirs="server-tools"
fi
AC_SUBST(tools_dirs)
#MYSQL_CHECK_CPU #MYSQL_CHECK_CPU
libmysqld_dirs= libmysqld_dirs=
......
...@@ -207,7 +207,6 @@ install-exec-hook: ...@@ -207,7 +207,6 @@ install-exec-hook:
test ! -f mysqld.sym.gz || $(INSTALL_DATA) mysqld.sym.gz $(DESTDIR)$(pkglibdir) test ! -f mysqld.sym.gz || $(INSTALL_DATA) mysqld.sym.gz $(DESTDIR)$(pkglibdir)
if HAVE_DTRACE_DASH_G if HAVE_DTRACE_DASH_G
abs_top_srcdir = @abs_top_srcdir@
mysqld_LDADD += probes_all.o mysqld_LDADD += probes_all.o
mysqld_DEPENDENCIES += probes_all.o dtrace_files dtrace_providers mysqld_DEPENDENCIES += probes_all.o dtrace_files dtrace_providers
CLEANFILES += dtrace_files dtrace_providers probes_all.o CLEANFILES += dtrace_files dtrace_providers probes_all.o
...@@ -221,10 +220,8 @@ dtrace_providers: ...@@ -221,10 +220,8 @@ dtrace_providers:
DTRACEDIRS = . ../mysys $(patsubst %,$(top_builddir)/storage/%,@mysql_se_dirs@) DTRACEDIRS = . ../mysys $(patsubst %,$(top_builddir)/storage/%,@mysql_se_dirs@)
probes_all.o: probes_mysql.d $(DTRACEFILES) probes_all.o: probes_mysql.d $(DTRACEFILES)
providers=`(for i in $(DTRACEDIRS); do cat $$i/dtrace_providers 2>/dev/null; done) | providers=`(for i in $(DTRACEDIRS); do cat $$i/dtrace_providers 2>/dev/null; done) | tr " " "\n" | sort | uniq | sed -e '/^$$/d' -e 's/^/-s /'`; \
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 -n "$$i/$$j "; done; done`; \
$(DTRACE) $(DTRACEFLAGS) -G $$providers $$objects -o $@ $(DTRACE) $(DTRACEFLAGS) -G $$providers $$objects -o $@
endif endif
......
...@@ -483,7 +483,7 @@ net_write_command(NET *net,uchar command, ...@@ -483,7 +483,7 @@ net_write_command(NET *net,uchar command,
(head_len && net_write_buff(net, header, head_len)) || (head_len && net_write_buff(net, header, head_len)) ||
net_write_buff(net, packet, len) || net_flush(net)); net_write_buff(net, packet, len) || net_flush(net));
MYSQL_NET_WRITE_DONE(rc); MYSQL_NET_WRITE_DONE(rc);
return rc; DBUG_RETURN(rc);
} }
/** /**
......
...@@ -68,7 +68,6 @@ archive_reader_LDFLAGS = @NOINST_LDFLAGS@ ...@@ -68,7 +68,6 @@ archive_reader_LDFLAGS = @NOINST_LDFLAGS@
EXTRA_DIST = CMakeLists.txt plug.in EXTRA_DIST = CMakeLists.txt plug.in
if HAVE_DTRACE_DASH_G if HAVE_DTRACE_DASH_G
abs_top_srcdir = @abs_top_srcdir@
libarchive_a_LIBADD = probes_mysql.o libarchive_a_LIBADD = probes_mysql.o
libarchive_a_DEPENDENCIES = probes_mysql.o dtrace_files dtrace_providers libarchive_a_DEPENDENCIES = probes_mysql.o dtrace_files dtrace_providers
CLEANFILES = probes_mysql.o dtrace_files dtrace_providers CLEANFILES = probes_mysql.o dtrace_files dtrace_providers
......
...@@ -50,7 +50,6 @@ libblackhole_a_SOURCES= ha_blackhole.cc ...@@ -50,7 +50,6 @@ libblackhole_a_SOURCES= ha_blackhole.cc
EXTRA_DIST = CMakeLists.txt plug.in EXTRA_DIST = CMakeLists.txt plug.in
if HAVE_DTRACE_DASH_G if HAVE_DTRACE_DASH_G
abs_top_srcdir = @abs_top_srcdir@
libblackhole_a_LIBADD = probes_mysql.o libblackhole_a_LIBADD = probes_mysql.o
libblackhole_a_DEPENDENCIES = probes_mysql.o dtrace_files dtrace_providers libblackhole_a_DEPENDENCIES = probes_mysql.o dtrace_files dtrace_providers
CLEANFILES = probes_mysql.o dtrace_files dtrace_providers CLEANFILES = probes_mysql.o dtrace_files dtrace_providers
......
...@@ -43,7 +43,6 @@ libcsv_a_SOURCES = transparent_file.cc ha_tina.cc ...@@ -43,7 +43,6 @@ libcsv_a_SOURCES = transparent_file.cc ha_tina.cc
EXTRA_DIST = CMakeLists.txt plug.in EXTRA_DIST = CMakeLists.txt plug.in
if HAVE_DTRACE_DASH_G if HAVE_DTRACE_DASH_G
abs_top_srcdir = @abs_top_srcdir@
libcsv_a_LIBADD = probes_mysql.o libcsv_a_LIBADD = probes_mysql.o
libcsv_a_DEPENDENCIES = probes_mysql.o dtrace_files dtrace_providers libcsv_a_DEPENDENCIES = probes_mysql.o dtrace_files dtrace_providers
CLEANFILES = probes_mysql.o dtrace_files dtrace_providers CLEANFILES = probes_mysql.o dtrace_files dtrace_providers
......
...@@ -50,7 +50,6 @@ libfederated_a_SOURCES= ha_federated.cc ...@@ -50,7 +50,6 @@ libfederated_a_SOURCES= ha_federated.cc
EXTRA_DIST = CMakeLists.txt plug.in EXTRA_DIST = CMakeLists.txt plug.in
if HAVE_DTRACE_DASH_G if HAVE_DTRACE_DASH_G
abs_top_srcdir = @abs_top_srcdir@
libfederated_a_LIBADD = probes_mysql.o libfederated_a_LIBADD = probes_mysql.o
libfederated_a_DEPENDENCIES = probes_mysql.o dtrace_files dtrace_providers libfederated_a_DEPENDENCIES = probes_mysql.o dtrace_files dtrace_providers
CLEANFILES = probes_mysql.o dtrace_files dtrace_providers CLEANFILES = probes_mysql.o dtrace_files dtrace_providers
......
...@@ -52,7 +52,6 @@ libheap_a_SOURCES = hp_open.c hp_extra.c hp_close.c hp_panic.c hp_info.c \ ...@@ -52,7 +52,6 @@ libheap_a_SOURCES = hp_open.c hp_extra.c hp_close.c hp_panic.c hp_info.c \
EXTRA_DIST = CMakeLists.txt plug.in EXTRA_DIST = CMakeLists.txt plug.in
if HAVE_DTRACE_DASH_G if HAVE_DTRACE_DASH_G
abs_top_srcdir = @abs_top_srcdir@
libheap_a_LIBADD = probes_mysql.o libheap_a_LIBADD = probes_mysql.o
libheap_a_DEPENDENCIES = probes_mysql.o dtrace_files dtrace_providers libheap_a_DEPENDENCIES = probes_mysql.o dtrace_files dtrace_providers
CLEANFILES = probes_mysql.o dtrace_files dtrace_providers CLEANFILES = probes_mysql.o dtrace_files dtrace_providers
......
...@@ -151,7 +151,6 @@ SUFFIXES = .sh ...@@ -151,7 +151,6 @@ SUFFIXES = .sh
@MV@ $@-t $@ @MV@ $@-t $@
if HAVE_DTRACE_DASH_G if HAVE_DTRACE_DASH_G
abs_top_srcdir = @abs_top_srcdir@
libmyisam_a_LIBADD = probes_mysql.o libmyisam_a_LIBADD = probes_mysql.o
libmyisam_a_DEPENDENCIES = probes_mysql.o dtrace_files dtrace_providers libmyisam_a_DEPENDENCIES = probes_mysql.o dtrace_files dtrace_providers
CLEANFILES += probes_mysql.o dtrace_files dtrace_providers CLEANFILES += probes_mysql.o dtrace_files dtrace_providers
......
...@@ -41,7 +41,6 @@ libmyisammrg_a_SOURCES = myrg_open.c myrg_extra.c myrg_info.c myrg_locking.c \ ...@@ -41,7 +41,6 @@ libmyisammrg_a_SOURCES = myrg_open.c myrg_extra.c myrg_info.c myrg_locking.c \
EXTRA_DIST = CMakeLists.txt plug.in EXTRA_DIST = CMakeLists.txt plug.in
if HAVE_DTRACE_DASH_G if HAVE_DTRACE_DASH_G
abs_top_srcdir = @abs_top_srcdir@
libmyisammrg_a_LIBADD = probes_mysql.o libmyisammrg_a_LIBADD = probes_mysql.o
libmyisammrg_a_DEPENDENCIES = probes_mysql.o dtrace_files dtrace_providers libmyisammrg_a_DEPENDENCIES = probes_mysql.o dtrace_files dtrace_providers
CLEANFILES = probes_mysql.o dtrace_files dtrace_providers CLEANFILES = probes_mysql.o dtrace_files dtrace_providers
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment