From: kevin.lewis
Date: December 9 2010 5:30pm
Subject: bzr push into mysql-trunk-innodb branch (kevin.lewis:3372 to 3373) Bug#58629
List-Archive: http://lists.mysql.com/commits/126470
X-Bug: 58629
Message-Id: <20101209173006.3E9038782C1@kevin-lewis-macbook.local>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3373 kevin.lewis@stripped	2010-12-09
      Bug#58629 - Do not define UNIV_MUST_NOT_INLINE on any platform and try it out on pushbuild

    modified:
      storage/innobase/include/univ.i
 3372 kevin.lewis@stripped	2010-12-09 [merge]
      merge from mysql-5.5-innodb to mysql-trunk-innodb

    modified:
      storage/innobase/dict/dict0load.c
=== modified file 'storage/innobase/include/univ.i'
--- a/storage/innobase/include/univ.i	revid:kevin.lewis@stripped
+++ b/storage/innobase/include/univ.i	revid:kevin.lewis@stripped
@@ -125,7 +125,7 @@ Sun Studio */
 
 # if !defined(__GNUC__) && !(defined(__SUNPRO_C) || defined(__SUNPRO_CC))
 #  undef  UNIV_MUST_NOT_INLINE			/* Remove compiler warning */
-#  define UNIV_MUST_NOT_INLINE
+//#  define UNIV_MUST_NOT_INLINE
 # endif
 
 # ifdef HAVE_PREAD

No bundle (reason: useless for push emails).