summaryrefslogtreecommitdiff
path: root/libmysql_r
diff options
context:
space:
mode:
authormsvensson@shellback.(none) <>2006-05-31 16:19:06 +0200
committermsvensson@shellback.(none) <>2006-05-31 16:19:06 +0200
commit20217ba36f11fde8eba391bab6fdeaed28900d73 (patch)
treeeec37d5fd4ee259d7eacec279bb80e6952f0a995 /libmysql_r
parent971dc90e3ae52ec34f09f3d706c51ee2dab53177 (diff)
downloadmariadb-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 'libmysql_r')
-rw-r--r--libmysql_r/Makefile.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/libmysql_r/Makefile.am b/libmysql_r/Makefile.am
index d28f31b2258..aaf81add00b 100644
--- a/libmysql_r/Makefile.am
+++ b/libmysql_r/Makefile.am
@@ -25,7 +25,7 @@ target_defs = -DDONT_USE_RAID -DMYSQL_CLIENT @LIB_EXTRA_CCFLAGS@
LIBS = @LIBS@ @ZLIB_LIBS@ @openssl_libs@
INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
- $(openssl_includes) $(yassl_includes) @ZLIB_INCLUDES@
+ $(openssl_includes) @ZLIB_INCLUDES@
## automake barfs if you don't use $(srcdir) or $(top_srcdir) in include
include $(top_srcdir)/libmysql/Makefile.shared