bk commit into 6.0 tree (jperkin:1.2617)

[Jonathan Perkin]

Below is the list of changes that have just been committed into a local
6.0 repository of jperkin.  When jperkin does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-04-16 22:29:22+02:00, jperkin@stripped +1 -0
  univ.i:
    Enable inlining on newer Sun Studio compilers.

  storage/innobase/include/univ.i@stripped, 2008-04-16 22:28:06+02:00, jperkin@stripped +1 -1
    Enable inlining on newer Sun Studio compilers.

diff -Nrup a/storage/innobase/include/univ.i b/storage/innobase/include/univ.i
--- a/storage/innobase/include/univ.i	2008-03-27 02:56:01 +01:00
+++ b/storage/innobase/include/univ.i	2008-04-16 22:28:06 +02:00
@@ -58,7 +58,7 @@ of the 32-bit x86 assembler in mutex ope
 /* We only try to do explicit inlining of functions with gcc and
 Microsoft Visual C++ */
 
-# if !defined(__GNUC__)
+# if !defined(__GNUC__) (!defined(__SUNPRO_C) || (__SUNPRO_C < 0x590))
 #  undef  UNIV_MUST_NOT_INLINE			/* Remove compiler warning */
 #  define UNIV_MUST_NOT_INLINE
 # endif