summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRamil Kalimullin <ramil@mysql.com>2010-07-16 11:15:22 +0400
committerRamil Kalimullin <ramil@mysql.com>2010-07-16 11:15:22 +0400
commita9b8eb4255ca8f44fd941097eba86199658ef461 (patch)
treed4430ad2ed4aa146c01208f35243496bb82a3d87
parentc38864d426b5ec8cfa10292350fba353ec8d4758 (diff)
downloadmariadb-git-a9b8eb4255ca8f44fd941097eba86199658ef461.tar.gz
Fix for bug #50667: The InnoDB plugin prevents initialization
of the "embedded" server Problem: mysqltest_embedded failed to load ha_innodb_plugin library on some platforms (due to some unresolved references). Fix: on FreeBSD use -export-dynamic flag building mysqltest_embedded. That allows to use its global symbols to resolve references in the dynamically loaded plugin library.
-rw-r--r--libmysqld/examples/Makefile.am3
1 files changed, 2 insertions, 1 deletions
diff --git a/libmysqld/examples/Makefile.am b/libmysqld/examples/Makefile.am
index 109d33a85ae..fd37f362960 100644
--- a/libmysqld/examples/Makefile.am
+++ b/libmysqld/examples/Makefile.am
@@ -42,7 +42,8 @@ LDADD = @CLIENT_EXTRA_LDFLAGS@ ../libmysqld.a @LIBDL@ $(CXXLDFLAGS) \
mysqltest_embedded_LINK = $(CXXLINK)
nodist_mysqltest_embedded_SOURCES = mysqltest.cc
-mysqltest_embedded_LDADD = $(LDADD) $(top_builddir)/regex/libregex.a
+mysqltest_embedded_LDADD = $(LDADD) $(top_builddir)/regex/libregex.a \
+ @MYSQLD_EXTRA_LDFLAGS@
nodist_mysql_SOURCES = mysql.cc readline.cc completion_hash.cc \
my_readline.h sql_string.h completion_hash.h