summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xCMakeLists.txt1
-rw-r--r--Makefile.am4
-rw-r--r--config/ac-macros/dtrace.m414
-rw-r--r--configure.in13
-rw-r--r--sql/Makefile.am7
-rw-r--r--sql/net_serv.cc2
-rw-r--r--storage/archive/Makefile.am3
-rw-r--r--storage/blackhole/Makefile.am3
-rw-r--r--storage/csv/Makefile.am3
-rw-r--r--storage/example/Makefile.am2
-rw-r--r--storage/federated/Makefile.am3
-rw-r--r--storage/heap/Makefile.am3
-rw-r--r--storage/myisam/Makefile.am3
-rw-r--r--storage/myisammrg/Makefile.am3
14 files changed, 20 insertions, 44 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7107a112f19..957cfd4c102 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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)
diff --git a/Makefile.am b/Makefile.am
index c0a5334a032..b1f15e76ab1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -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
diff --git a/config/ac-macros/dtrace.m4 b/config/ac-macros/dtrace.m4
index d37667767d1..e2c8de61a19 100644
--- a/config/ac-macros/dtrace.m4
+++ b/config/ac-macros/dtrace.m4
@@ -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=""
diff --git a/configure.in b/configure.in
index 8ce9009b9bd..9246f73c3e4 100644
--- a/configure.in
+++ b/configure.in
@@ -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=
diff --git a/sql/Makefile.am b/sql/Makefile.am
index 1b7e8bc377d..dcba2407837 100644
--- a/sql/Makefile.am
+++ b/sql/Makefile.am
@@ -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
diff --git a/sql/net_serv.cc b/sql/net_serv.cc
index 19645786433..ed47e4b9c7b 100644
--- a/sql/net_serv.cc
+++ b/sql/net_serv.cc
@@ -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);
}
/**
diff --git a/storage/archive/Makefile.am b/storage/archive/Makefile.am
index aa2ba58ce25..649d84d8152 100644
--- a/storage/archive/Makefile.am
+++ b/storage/archive/Makefile.am
@@ -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
diff --git a/storage/blackhole/Makefile.am b/storage/blackhole/Makefile.am
index 71776b01639..c274ce8f908 100644
--- a/storage/blackhole/Makefile.am
+++ b/storage/blackhole/Makefile.am
@@ -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
diff --git a/storage/csv/Makefile.am b/storage/csv/Makefile.am
index e4d90334d64..fa7f77bd746 100644
--- a/storage/csv/Makefile.am
+++ b/storage/csv/Makefile.am
@@ -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
diff --git a/storage/example/Makefile.am b/storage/example/Makefile.am
index bb350dc3639..bcf519c67c6 100644
--- a/storage/example/Makefile.am
+++ b/storage/example/Makefile.am
@@ -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
diff --git a/storage/federated/Makefile.am b/storage/federated/Makefile.am
index 221b30092d2..25db59dc3ce 100644
--- a/storage/federated/Makefile.am
+++ b/storage/federated/Makefile.am
@@ -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
diff --git a/storage/heap/Makefile.am b/storage/heap/Makefile.am
index d5fd952b4bd..5528fec71f1 100644
--- a/storage/heap/Makefile.am
+++ b/storage/heap/Makefile.am
@@ -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
diff --git a/storage/myisam/Makefile.am b/storage/myisam/Makefile.am
index c79fc2e0f03..797d7523301 100644
--- a/storage/myisam/Makefile.am
+++ b/storage/myisam/Makefile.am
@@ -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
diff --git a/storage/myisammrg/Makefile.am b/storage/myisammrg/Makefile.am
index 267ce71f8d1..2ae808c2011 100644
--- a/storage/myisammrg/Makefile.am
+++ b/storage/myisammrg/Makefile.am
@@ -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
View Lorry Controller Status