diff options
| author | unknown <msvensson@shellback.(none)> | 2006-05-31 16:32:08 +0200 |
|---|---|---|
| committer | unknown <msvensson@shellback.(none)> | 2006-05-31 16:32:08 +0200 |
| commit | 0444d22f2decc5a0d920c7bea1b5ced036f8c332 (patch) | |
| tree | 43c75d8e6d8a5a60d0090df1d0bd6117d909a85e /server-tools | |
| parent | 3ebe4455c2e7192ef68874a9f99f59d66cef2a1f (diff) | |
| parent | e03f47859fe2fdbe465613712448a65dcdfc03ac (diff) | |
| download | mariadb-git-0444d22f2decc5a0d920c7bea1b5ced036f8c332.tar.gz | |
Merge shellback.(none):/home/msvensson/mysql/bug19575/my50-bug19575
into shellback.(none):/home/msvensson/mysql/mysql-5.0
extra/yassl/include/openssl/ssl.h:
Auto merged
Diffstat (limited to 'server-tools')
| -rw-r--r-- | server-tools/instance-manager/Makefile.am | 2 |
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 |