summaryrefslogtreecommitdiff
path: root/libmysqld
diff options
context:
space:
mode:
authorMikael Ronstrom <mikael@mysql.com>2008-12-20 11:01:41 +0100
committerMikael Ronstrom <mikael@mysql.com>2008-12-20 11:01:41 +0100
commit16a024c486f75b9eadc046511f48a23e566e9c4b (patch)
tree36aa1edfd94289934ffa3aa66af64b899e9a9e77 /libmysqld
parent8d162b444ab0e4396098d0a5e1f23811441917a1 (diff)
downloadmariadb-git-16a024c486f75b9eadc046511f48a23e566e9c4b.tar.gz
Backport of DTrace patches from 6.0
Diffstat (limited to 'libmysqld')
-rw-r--r--libmysqld/Makefile.am3
1 files changed, 2 insertions, 1 deletions
diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am
index ef2fab2da6d..1657afc47fd 100644
--- a/libmysqld/Makefile.am
+++ b/libmysqld/Makefile.am
@@ -28,7 +28,8 @@ DEFS = -DEMBEDDED_LIBRARY -DMYSQL_SERVER \
-DDEFAULT_MYSQL_HOME="\"$(MYSQLBASEdir)\"" \
-DDATADIR="\"$(MYSQLDATAdir)\"" \
-DSHAREDIR="\"$(MYSQLSHAREdir)\"" \
- -DPLUGINDIR="\"$(pkgplugindir)\""
+ -DPLUGINDIR="\"$(pkgplugindir)\"" \
+ -DDISABLE_DTRACE
INCLUDES= -I$(top_builddir)/include -I$(top_srcdir)/include \
-I$(top_builddir)/sql -I$(top_srcdir)/sql \
-I$(top_srcdir)/sql/examples \