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 /client | |
| 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 'client')
| -rw-r--r-- | client/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/client/Makefile.am b/client/Makefile.am index 9d133125a0d..5787905fd35 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -25,7 +25,7 @@ endif INCLUDES = -I$(top_builddir)/include \ -I$(top_srcdir)/include \ -I$(top_srcdir)/regex \ - $(openssl_includes) $(yassl_includes) + $(openssl_includes) LIBS = @CLIENT_LIBS@ LDADD= @CLIENT_EXTRA_LDFLAGS@ \ $(top_builddir)/libmysql/libmysqlclient.la @@ -69,7 +69,7 @@ link_sources: done; \ rm -f $(srcdir)/my_user.c; \ @LN_CP_F@ $(top_srcdir)/sql-common/my_user.c my_user.c; - + # Don't update the files from bitkeeper %::SCCS/s.% |