summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorDavi Arnaut <Davi.Arnaut@Sun.COM>2008-08-01 12:10:06 -0300
committerDavi Arnaut <Davi.Arnaut@Sun.COM>2008-08-01 12:10:06 -0300
commit9f550e6fbdd994edc4ef0d447b29ab83df9aa0aa (patch)
treec34ee2414648086fce4cd7ef47b2a00e8ea08b60 /client
parent3d215551bb0e3346bd0058ed3ab7afb256846088 (diff)
downloadmariadb-git-9f550e6fbdd994edc4ef0d447b29ab83df9aa0aa.tar.gz
Bug#37003: Tests sporadically crashes with embedded server
Post-merge fix: Alter linking order so that the thread linking flags appear last in the list. This needs to be done this way because some linkers will not search the thread archive again if a undefined symbol (pthread_kill in this case) appears later.
Diffstat (limited to 'client')
-rw-r--r--client/Makefile.am5
1 files changed, 3 insertions, 2 deletions
diff --git a/client/Makefile.am b/client/Makefile.am
index 940766ac66c..25b0c0cee00 100644
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -88,11 +88,12 @@ mysqlslap_LDADD = $(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \
mysqltest_SOURCES= mysqltest.c
mysqltest_CFLAGS= -DTHREAD -UUNDEF_THREADS_HACK
-mysqltest_LDADD = $(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \
+mysqltest_LDADD = $(CXXLDFLAGS) \
@CLIENT_EXTRA_LDFLAGS@ \
$(LIBMYSQLCLIENT_LA) \
$(top_builddir)/mysys/libmysys.a \
- $(top_builddir)/regex/libregex.a
+ $(top_builddir)/regex/libregex.a \
+ $(CLIENT_THREAD_LIBS)
mysql_upgrade_SOURCES= mysql_upgrade.c \
$(top_srcdir)/mysys/my_getpagesize.c