List:Commits« Previous MessageNext Message »
From:Georgi Kodinov Date:April 23 2012 1:33pm
Subject:bzr push into mysql-5.5 branch (Georgi.Kodinov:3805 to 3806) Bug#59148
View as plain text  
 3806 Georgi Kodinov	2012-04-23
      Bug #59148 - made tests experimental
      Fixed a cmake 2.8.8 compilation problem.

    modified:
      configure.cmake
 3805 Kent Boortz	2012-04-23 [merge]
      Merge

    modified:
      storage/innobase/srv/srv0start.c
=== modified file 'configure.cmake'
--- a/configure.cmake	2011-08-09 08:03:29 +0000
+++ b/configure.cmake	2012-04-23 13:26:22 +0000
@@ -149,7 +149,9 @@ IF(UNIX)
   SET(CMAKE_REQUIRED_LIBRARIES 
     ${LIBM} ${LIBNSL} ${LIBBIND} ${LIBCRYPT} ${LIBSOCKET} ${LIBDL} ${CMAKE_THREAD_LIBS_INIT} ${LIBRT})
 
-  LIST(REMOVE_DUPLICATES CMAKE_REQUIRED_LIBRARIES)
+  IF(NOT ${CMAKE_REQUIRED_LIBRARIES} MATCHES '')
+    LIST(REMOVE_DUPLICATES ${CMAKE_REQUIRED_LIBRARIES})
+  ENDIF()  
   LINK_LIBRARIES(${CMAKE_THREAD_LIBS_INIT})
   
   OPTION(WITH_LIBWRAP "Compile with tcp wrappers support" OFF)

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.5 branch (Georgi.Kodinov:3805 to 3806) Bug#59148Georgi Kodinov23 Apr