From 5dbbb867e1c38a37bc0a842581250113c7d61c00 Mon Sep 17 00:00:00 2001
From: Vladislav Vaintroub <vv221804@loki07>
Date: Wed, 23 Dec 2009 04:44:25 +0100
Subject: [PATCH] restore flaky loadxml test, fix solaris plugin load using
 -lpthread instead of -lthread

---
 configure.cmake           | 7 +++++++
 mysql-test/t/loadxml.test | 3 ---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/configure.cmake b/configure.cmake
index a0db5669471..353d70aa571 100644
--- a/configure.cmake
+++ b/configure.cmake
@@ -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})
 
diff --git a/mysql-test/t/loadxml.test b/mysql-test/t/loadxml.test
index 627b74ce919..8b9c1bd1b0d 100644
--- a/mysql-test/t/loadxml.test
+++ b/mysql-test/t/loadxml.test
@@ -84,10 +84,7 @@ sleep 1;
 sleep 2;
 --enable_query_log
 
-connection addconroot;
---reap
 disconnect addconroot;
-connection default;
 
 #
 # Clean up