summaryrefslogtreecommitdiff
path: root/server-tools
diff options
context:
space:
mode:
authormsvensson@shellback.(none) <>2006-05-31 16:32:08 +0200
committermsvensson@shellback.(none) <>2006-05-31 16:32:08 +0200
commitc542aa87018afe627bd8c456350a228fb4949f9b (patch)
tree43c75d8e6d8a5a60d0090df1d0bd6117d909a85e /server-tools
parentfe0e91d50198488c31e235e93fb84ffa0d605d52 (diff)
parent20217ba36f11fde8eba391bab6fdeaed28900d73 (diff)
downloadmariadb-git-c542aa87018afe627bd8c456350a228fb4949f9b.tar.gz
Merge shellback.(none):/home/msvensson/mysql/bug19575/my50-bug19575
into shellback.(none):/home/msvensson/mysql/mysql-5.0
Diffstat (limited to 'server-tools')
-rw-r--r--server-tools/instance-manager/Makefile.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/server-tools/instance-manager/Makefile.am b/server-tools/instance-manager/Makefile.am
index 218eceebd12..6b5d80a99af 100644
--- a/server-tools/instance-manager/Makefile.am
+++ b/server-tools/instance-manager/Makefile.am
@@ -15,7 +15,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
INCLUDES= @ZLIB_INCLUDES@ -I$(top_srcdir)/include \
- @openssl_includes@ @yassl_includes@ -I$(top_builddir)/include
+ @openssl_includes@ -I$(top_builddir)/include
DEFS= -DMYSQL_INSTANCE_MANAGER -DMYSQL_SERVER