mirror of
https://github.com/MariaDB/server.git
synced 2026-05-07 15:45:33 +02:00
restore flaky loadxml test, fix solaris plugin load using -lpthread instead of -lthread
This commit is contained in:
parent
301f28c158
commit
5dbbb867e1
2 changed files with 7 additions and 3 deletions
|
|
@ -284,6 +284,13 @@ IF(UNIX)
|
|||
ENDIF()
|
||||
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
|
||||
${LIBM} ${LIBNSL} ${LIBBIND} ${LIBCRYPT} ${LIBSOCKET} ${LIBDL} ${CMAKE_THREAD_LIBS_INIT} ${LIBRT})
|
||||
|
||||
|
|
|
|||
|
|
@ -84,10 +84,7 @@ sleep 1;
|
|||
sleep 2;
|
||||
--enable_query_log
|
||||
|
||||
connection addconroot;
|
||||
--reap
|
||||
disconnect addconroot;
|
||||
connection default;
|
||||
|
||||
#
|
||||
# Clean up
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue