diff options
| author | msvensson@shellback.(none) <> | 2006-05-31 16:19:06 +0200 |
|---|---|---|
| committer | msvensson@shellback.(none) <> | 2006-05-31 16:19:06 +0200 |
| commit | 20217ba36f11fde8eba391bab6fdeaed28900d73 (patch) | |
| tree | eec37d5fd4ee259d7eacec279bb80e6952f0a995 /tools | |
| parent | 971dc90e3ae52ec34f09f3d706c51ee2dab53177 (diff) | |
| download | mariadb-git-20217ba36f11fde8eba391bab6fdeaed28900d73.tar.gz | |
Bug#19575 MySQL-shared-5.0.21-0.glibc23 causes segfault in SSL_library_init
- Include prefix files that renames all public functions in yaSSLs
OpenSSL API to ya<function_name>. They will otherwise conflict
with OpenSSL functions if loaded by an application that uses OpenSSL
as well as libmysqlclient with yaSSL support.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am index 0f726bd5fc3..61b9a612dc5 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -24,7 +24,7 @@ INCLUDES= -I$(top_builddir)/include -I$(top_srcdir)/include \ $(openssl_includes) LDADD= @CLIENT_EXTRA_LDFLAGS@ \ $(top_builddir)/libmysql_r/libmysqlclient_r.la \ - @openssl_libs@ @ZLIB_LIBS@ + @openssl_libs@ @yassl_libs@ @ZLIB_LIBS@ bin_PROGRAMS= mysqltestmanager mysqltestmanager_SOURCES= mysqlmanager.c $(yassl_dummy_link_fix) mysqltestmanager_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES) |