From: Date: June 27 2008 12:05am
Subject: commit into mysql-6.0-falcon branch (olav:2720) Bug#37679
List-Archive: http://lists.mysql.com/commits/48592
X-Bug: 37679
Message-Id: <20080626220505.19161.qmail@fimafeng08>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

#At bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-6.0-falcon/

 2720 Olav Sandstaa	2008-06-27
      Fix to Bug#37679 Falcon does not compile on OpenSolaris/Nevada using the Sun Studio compiler
      
      Extend the check for which Solaris version that is used to include Solaris 11 (SunOS 5.11) in addition 
      to Solaris 10. Both of these Solaris versions has support for atomic_cas_ operations.
modified:
  storage/falcon/Interlock.h


=== modified file 'storage/falcon/Interlock.h'
--- a/storage/falcon/Interlock.h	2008-05-04 21:32:46 +0000
+++ b/storage/falcon/Interlock.h	2008-06-26 22:04:56 +0000
@@ -143,7 +143,7 @@
        Todo: get assembler version of atomic_cas_uint().
      */
 #elif (defined(__sparcv8) || defined(__sparcv9) || defined(__sun)) && !defined(__GNUC__)
-#if defined(__SunOS_5_10)
+#if defined(__SunOS_5_10) || defined(__SunOS_5_11)
     return (compare == atomic_cas_uint((volatile uint_t *)target, compare, exchange));
 #else
 #  error cas not defined. We need >= Solaris 10
@@ -253,7 +253,7 @@
        Todo: get assembler version of atomic_cas_ptr().
      */
 #elif (defined(__sparcv8) || defined(__sparcv9) || defined(__sun)) && !defined(__GNUC__)
-#if defined(__SunOS_5_10)
+#if defined(__SunOS_5_10) || defined(__SunOS_5_11)
     return (char)(compare == atomic_cas_ptr(target, compare, exchange));
 #else
 #  error cas not defined. We need >= Solaris 10