mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 03:52:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

A number of fixes to DTrace patch

Browse source 
Removed instance manager from builds
This commit is contained in:
Mikael Ronstrom 2008-12-20 15:16:46 +01:00
parent 0339019df6
commit 4eaa41e296
14 changed files with 20 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CMakeLists.txt
View file

@ -248,7 +248,6 @@ IF(WITH_INNOBASE_STORAGE_ENGINE)
ADD_SUBDIRECTORY(storage/innobase)
ENDIF(WITH_INNOBASE_STORAGE_ENGINE)
ADD_SUBDIRECTORY(sql)
ADD_SUBDIRECTORY(server-tools/instance-manager)
ADD_SUBDIRECTORY(libmysql)
ADD_SUBDIRECTORY(tests)
IF(WITH_EMBEDDED_SERVER)

4
Makefile.am
View file

@ -27,7 +27,7 @@ SUBDIRS = . include @docs_dirs@ @zlib_dir@ \
@sql_union_dirs@ unittest storage plugin \
@sql_server@ @man_dirs@ tests \
netware @libmysqld_dirs@ \
mysql-test support-files sql-bench @tools_dirs@ \
mysql-test support-files sql-bench \
win
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 \
vio sql man tests \
netware libmysqld \
mysql-test support-files sql-bench server-tools \
mysql-test support-files sql-bench \
win \
BUILD
DISTCLEANFILES = ac_available_languages_fragment

14
config/ac-macros/dtrace.m4
View file

@ -2,13 +2,13 @@ dnl ---------------------------------------------------------------------------
dnl Macro: DTRACE_TEST
dnl ---------------------------------------------------------------------------
AC_ARG_ENABLE(dtrace,
AC_HELP_STRING([--enable-dtrace],[Build with support for the DTRACE.]),
[
ENABLE_DTRACE="$enable_dtrace"
],
[
ENABLE_DTRACE="yes"
]
AC_HELP_STRING([--enable-dtrace],[Build with support for the DTRACE.]),
[
ENABLE_DTRACE="$enable_dtrace"
],
[
ENABLE_DTRACE="yes"
]
)
DTRACEFLAGS=""
HAVE_DTRACE=""

13
configure.in
View file

@ -2507,19 +2507,6 @@ then
[Access checks in embedded library])
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
libmysqld_dirs=

7
sql/Makefile.am
View file

@ -207,7 +207,6 @@ install-exec-hook:
test ! -f mysqld.sym.gz || $(INSTALL_DATA) mysqld.sym.gz $(DESTDIR)$(pkglibdir)
if HAVE_DTRACE_DASH_G
abs_top_srcdir = @abs_top_srcdir@
mysqld_LDADD += probes_all.o
mysqld_DEPENDENCIES += probes_all.o dtrace_files dtrace_providers
CLEANFILES += dtrace_files dtrace_providers probes_all.o
@ -221,10 +220,8 @@ dtrace_providers:
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`; \
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`; \
$(DTRACE) $(DTRACEFLAGS) -G $$providers $$objects -o $@
endif

2
sql/net_serv.cc
View file

@ -483,7 +483,7 @@ net_write_command(NET *net,uchar command,
(head_len && net_write_buff(net, header, head_len)) ||
net_write_buff(net, packet, len) || net_flush(net));
MYSQL_NET_WRITE_DONE(rc);
return rc;
DBUG_RETURN(rc);
}
/**

3
storage/archive/Makefile.am
View file

@ -68,7 +68,6 @@ archive_reader_LDFLAGS = @NOINST_LDFLAGS@
EXTRA_DIST = CMakeLists.txt plug.in
if HAVE_DTRACE_DASH_G
abs_top_srcdir = @abs_top_srcdir@
libarchive_a_LIBADD = probes_mysql.o
libarchive_a_DEPENDENCIES = probes_mysql.o dtrace_files dtrace_providers
CLEANFILES = probes_mysql.o dtrace_files dtrace_providers
@ -80,7 +79,7 @@ dtrace_files:
dtrace_providers:
echo $(DTRACEPROVIDER) > $@
probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES)
$(DTRACE) $(DTRACEFLAGS) -G -s $< $(DTRACEFILES) -o $@
$(DTRACE) $(DTRACEFLAGS) -G -s $< $(DTRACEFILES) -o $@
endif
# Don't update the files from bitkeeper

3
storage/blackhole/Makefile.am
View file

@ -50,7 +50,6 @@ libblackhole_a_SOURCES= ha_blackhole.cc
EXTRA_DIST = CMakeLists.txt plug.in
if HAVE_DTRACE_DASH_G
abs_top_srcdir = @abs_top_srcdir@
libblackhole_a_LIBADD = probes_mysql.o
libblackhole_a_DEPENDENCIES = probes_mysql.o dtrace_files dtrace_providers
CLEANFILES = probes_mysql.o dtrace_files dtrace_providers
@ -62,7 +61,7 @@ dtrace_files:
dtrace_providers:
echo $(DTRACEPROVIDER) > $@
probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES)
$(DTRACE) $(DTRACEFLAGS) -G -s $< $(DTRACEFILES) -o $@
$(DTRACE) $(DTRACEFLAGS) -G -s $< $(DTRACEFILES) -o $@
endif
# Don't update the files from bitkeeper

3
storage/csv/Makefile.am
View file

@ -43,7 +43,6 @@ libcsv_a_SOURCES = transparent_file.cc ha_tina.cc
EXTRA_DIST = CMakeLists.txt plug.in
if HAVE_DTRACE_DASH_G
abs_top_srcdir = @abs_top_srcdir@
libcsv_a_LIBADD = probes_mysql.o
libcsv_a_DEPENDENCIES = probes_mysql.o dtrace_files dtrace_providers
CLEANFILES = probes_mysql.o dtrace_files dtrace_providers
@ -55,7 +54,7 @@ dtrace_files:
dtrace_providers:
echo $(DTRACEPROVIDER) > $@
probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES)
$(DTRACE) $(DTRACEFLAGS) -G -s $< $(DTRACEFILES) -o $@
$(DTRACE) $(DTRACEFLAGS) -G -s $< $(DTRACEFILES) -o $@
endif
# Don't update the files from bitkeeper

2
storage/example/Makefile.am
View file

@ -62,7 +62,7 @@ dtrace_files:
dtrace_providers:
echo $(DTRACEPROVIDER) > $@
probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES)
$(DTRACE) $(DTRACEFLAGS) -G -s $< $(DTRACEFILES) -o $@
$(DTRACE) $(DTRACEFLAGS) -G -s $< $(DTRACEFILES) -o $@
endif
# Don't update the files from bitkeeper

3
storage/federated/Makefile.am
View file

@ -50,7 +50,6 @@ libfederated_a_SOURCES= ha_federated.cc
EXTRA_DIST = CMakeLists.txt plug.in
if HAVE_DTRACE_DASH_G
abs_top_srcdir = @abs_top_srcdir@
libfederated_a_LIBADD = probes_mysql.o
libfederated_a_DEPENDENCIES = probes_mysql.o dtrace_files dtrace_providers
CLEANFILES = probes_mysql.o dtrace_files dtrace_providers
@ -62,7 +61,7 @@ dtrace_files:
dtrace_providers:
echo $(DTRACEPROVIDER) > $@
probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES)
$(DTRACE) $(DTRACEFLAGS) -G -s $< $(DTRACEFILES) -o $@
$(DTRACE) $(DTRACEFLAGS) -G -s $< $(DTRACEFILES) -o $@
endif
# Don't update the files from bitkeeper

3
storage/heap/Makefile.am
View file

@ -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
if HAVE_DTRACE_DASH_G
abs_top_srcdir = @abs_top_srcdir@
libheap_a_LIBADD = probes_mysql.o
libheap_a_DEPENDENCIES = probes_mysql.o dtrace_files dtrace_providers
CLEANFILES = probes_mysql.o dtrace_files dtrace_providers
@ -64,7 +63,7 @@ dtrace_files:
dtrace_providers:
echo $(DTRACEPROVIDER) > $@
probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES)
$(DTRACE) $(DTRACEFLAGS) -G -s $< $(DTRACEFILES) -o $@
$(DTRACE) $(DTRACEFLAGS) -G -s $< $(DTRACEFILES) -o $@
endif
# Don't update the files from bitkeeper

3
storage/myisam/Makefile.am
View file

@ -151,7 +151,6 @@ SUFFIXES = .sh
@MV@ $@-t $@
if HAVE_DTRACE_DASH_G
abs_top_srcdir = @abs_top_srcdir@
libmyisam_a_LIBADD = probes_mysql.o
libmyisam_a_DEPENDENCIES = probes_mysql.o dtrace_files dtrace_providers
CLEANFILES += probes_mysql.o dtrace_files dtrace_providers
@ -163,7 +162,7 @@ dtrace_files:
dtrace_providers:
echo $(DTRACEPROVIDER) > $@
probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES)
$(DTRACE) $(DTRACEFLAGS) -G -s $< $(DTRACEFILES) -o $@
$(DTRACE) $(DTRACEFLAGS) -G -s $< $(DTRACEFILES) -o $@
endif
# Don't update the files from bitkeeper

3
storage/myisammrg/Makefile.am
View file

@ -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
if HAVE_DTRACE_DASH_G
abs_top_srcdir = @abs_top_srcdir@
libmyisammrg_a_LIBADD = probes_mysql.o
libmyisammrg_a_DEPENDENCIES = probes_mysql.o dtrace_files dtrace_providers
CLEANFILES = probes_mysql.o dtrace_files dtrace_providers
@ -53,7 +52,7 @@ dtrace_files:
dtrace_providers:
echo $(DTRACEPROVIDER) > $@
probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES)
$(DTRACE) $(DTRACEFLAGS) -G -s $< $(DTRACEFILES) -o $@
$(DTRACE) $(DTRACEFLAGS) -G -s $< $(DTRACEFILES) -o $@
endif
# Don't update the files from bitkeeper