3568 Tor Didriksen 2011-11-07
WL#5825 Using C++ Standard Library with MySQL code
Post-push fix: different library layout for stlport on intel/sparc.
modified:
configure.cmake
3567 Marko Mäkelä 2011-11-07
Remove a debug assertion that fails in innodb.innodb_mysql in a join.
modified:
storage/innobase/handler/ha_innodb.cc
=== modified file 'configure.cmake'
--- a/configure.cmake 2011-11-04 12:59:47 +0000
+++ b/configure.cmake 2011-11-07 12:17:24 +0000
@@ -82,9 +82,12 @@ ENDMACRO()
IF(CMAKE_SYSTEM_NAME MATCHES "SunOS" AND CMAKE_C_COMPILER_ID MATCHES "SunPro")
DIRNAME(${CMAKE_CXX_COMPILER} CXX_PATH)
SET(STLPORT_SUFFIX "lib/stlport4")
- IF(CMAKE_CXX_FLAGS MATCHES "-m64")
+ IF(CMAKE_CXX_FLAGS MATCHES "-m64" AND CMAKE_SYSTEM_PROCESSOR MATCHES "sparc")
SET(STLPORT_SUFFIX "lib/stlport4/v9")
ENDIF()
+ IF(CMAKE_CXX_FLAGS MATCHES "-m64" AND CMAKE_SYSTEM_PROCESSOR MATCHES "i386")
+ SET(STLPORT_SUFFIX "lib/stlport4/amd64")
+ ENDIF()
FIND_LIBRARY(STL_LIBRARY_NAME
NAMES "stlport"
@@ -94,7 +97,7 @@ IF(CMAKE_SYSTEM_NAME MATCHES "SunOS" AND
IF(STL_LIBRARY_NAME)
DIRNAME(${STL_LIBRARY_NAME} STLPORT_PATH)
# We re-distribute libstlport.so which is a symlink to libstlport.so.1
- # There is no 'readlink' on solaris, sigh ..., so we use perl to find it:
+ # There is no 'readlink' on solaris, so we use perl to follow links:
SET(PERLSCRIPT
"my $link= $ARGV[0]; use Cwd qw(abs_path); my $file = abs_path($link); print $file;")
EXECUTE_PROCESS(
No bundle (reason: useless for push emails).
