Commit 5dbbb867 authored by Vladislav Vaintroub's avatar Vladislav Vaintroub

restore flaky loadxml test, fix solaris plugin load using -lpthread instead of -lthread

parent 301f28c1
...@@ -284,6 +284,13 @@ IF(UNIX) ...@@ -284,6 +284,13 @@ IF(UNIX)
ENDIF() ENDIF()
FIND_PACKAGE(Threads) FIND_PACKAGE(Threads)
IF(CMAKE_SYSTEM_NAME MATCHES "SunOS")
# CMake defined -lthread as thread flag
# This crashes in dlopen when trying to load plugins
# Workaround with -lpthread
SET(CMAKE_THREADS_LIBS_INIT -lpthread)
ENDIF()
SET(CMAKE_REQUIRED_LIBRARIES SET(CMAKE_REQUIRED_LIBRARIES
${LIBM} ${LIBNSL} ${LIBBIND} ${LIBCRYPT} ${LIBSOCKET} ${LIBDL} ${CMAKE_THREAD_LIBS_INIT} ${LIBRT}) ${LIBM} ${LIBNSL} ${LIBBIND} ${LIBCRYPT} ${LIBSOCKET} ${LIBDL} ${CMAKE_THREAD_LIBS_INIT} ${LIBRT})
......
...@@ -84,10 +84,7 @@ sleep 1; ...@@ -84,10 +84,7 @@ sleep 1;
sleep 2; sleep 2;
--enable_query_log --enable_query_log
connection addconroot;
--reap
disconnect addconroot; disconnect addconroot;
connection default;
# #
# Clean up # Clean up
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment