From: kevin.lewis Date: January 5 2011 3:18pm Subject: bzr commit into mysql-trunk-innodb branch (kevin.lewis:3403) Bug#58629 List-Archive: http://lists.mysql.com/commits/127984 X-Bug: 58629 Message-Id: <20110105151829.3D9C39706D9@kevin-lewis-macbook.local> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0746920720==" --===============0746920720== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///Users/kevinlewis/Work/Mysql/58629/mysql-trunk-innodb/ based on revid:jimmy.yang@stripped 3403 kevin.lewis@stripped 2011-01-05 Bug#58629 - Undefine UNIV_MUST_NOT_INLINE from normal builds so that inlining can occur on all operating systems. modified: BUILD/SETUP.sh BUILD/build_mccge.sh scripts/mysql_config.pl.in scripts/mysql_config.sh storage/innobase/CMakeLists.txt storage/innobase/include/univ.i === modified file 'BUILD/SETUP.sh' --- a/BUILD/SETUP.sh revid:jimmy.yang@stripped +++ b/BUILD/SETUP.sh revid:kevin.lewis@stripped @@ -125,7 +125,7 @@ valgrind_flags="$valgrind_flags -DMYSQL_ valgrind_configs="--with-valgrind" # # Used in -debug builds -debug_cflags="-DUNIV_MUST_NOT_INLINE -DEXTRA_DEBUG -DFORCE_INIT_OF_VARS " +debug_cflags="-DEXTRA_DEBUG -DFORCE_INIT_OF_VARS " debug_cflags="$debug_cflags -DSAFE_MUTEX" error_inject="--with-error-inject " # === modified file 'BUILD/build_mccge.sh' --- a/BUILD/build_mccge.sh revid:jimmy.yang@stripped +++ b/BUILD/build_mccge.sh revid:kevin.lewis@stripped @@ -1161,7 +1161,7 @@ set_with_debug_flags() { if test "x$with_debug_flag" = "xyes" ; then if test "x$developer_flag" = "xyes" ; then - loc_debug_flags="-DUNIV_MUST_NOT_INLINE -DEXTRA_DEBUG -DFORCE_INIT_OF_VARS " + loc_debug_flags="-DEXTRA_DEBUG -DFORCE_INIT_OF_VARS " compiler_flags="$compiler_flags $loc_debug_flags" fi compiler_flags="$compiler_flags $extra_debug_flags" === modified file 'scripts/mysql_config.pl.in' --- a/scripts/mysql_config.pl.in revid:jimmy.yang@stripped +++ b/scripts/mysql_config.pl.in revid:kevin.lewis@stripped @@ -42,7 +42,7 @@ use Cwd; use strict; my @exclude_cflags = - qw/DDBUG_OFF DSAFE_MUTEX DUNIV_MUST_NOT_INLINE DFORCE_INIT_OF_VARS + qw/DDBUG_OFF DSAFE_MUTEX DFORCE_INIT_OF_VARS DEXTRA_DEBUG DHAVE_purify O O[0-9] xO[0-9] W[-A-Za-z]* Xa xstrconst xc99=none unroll2 ip mp restrict/; === modified file 'scripts/mysql_config.sh' --- a/scripts/mysql_config.sh revid:jimmy.yang@stripped +++ b/scripts/mysql_config.sh revid:kevin.lewis@stripped @@ -133,7 +133,7 @@ include="-I$pkgincludedir" # and -xstrconst to make --cflags usable for Sun Forte C++ # FIXME until we have a --cxxflags, we need to remove -AC99 # to make --cflags usable for HP C++ (aCC) -for remove in DDBUG_OFF DSAFE_MUTEX DUNIV_MUST_NOT_INLINE DFORCE_INIT_OF_VARS \ +for remove in DDBUG_OFF DSAFE_MUTEX DFORCE_INIT_OF_VARS \ DEXTRA_DEBUG DHAVE_purify O 'O[0-9]' 'xO[0-9]' 'W[-A-Za-z]*' \ 'mtune=[-A-Za-z0-9]*' 'mcpu=[-A-Za-z0-9]*' 'march=[-A-Za-z0-9]*' \ Xa xstrconst "xc99=none" AC99 \ === modified file 'storage/innobase/CMakeLists.txt' --- a/storage/innobase/CMakeLists.txt revid:jimmy.yang@stripped +++ b/storage/innobase/CMakeLists.txt revid:kevin.lewis@stripped @@ -30,13 +30,11 @@ IF(UNIX) LINK_LIBRARIES(aio) ENDIF() ELSEIF(CMAKE_SYSTEM_NAME MATCHES "HP*") - ADD_DEFINITIONS("-DUNIV_HPUX -DUNIV_MUST_NOT_INLINE") + ADD_DEFINITIONS("-DUNIV_HPUX") ELSEIF(CMAKE_SYSTEM_NAME STREQUAL "AIX") - ADD_DEFINITIONS("-DUNIV_AIX -DUNIX_MUST_NOT_INLINE") + ADD_DEFINITIONS("-DUNIV_AIX") ELSEIF(CMAKE_SYSTEM_NAME STREQUAL "SunOS") ADD_DEFINITIONS("-DUNIV_SOLARIS") - ELSE() - ADD_DEFINITIONS("-DUNIV_MUST_NOT_INLINE") ENDIF() ENDIF() === modified file 'storage/innobase/include/univ.i' --- a/storage/innobase/include/univ.i revid:jimmy.yang@stripped +++ b/storage/innobase/include/univ.i revid:kevin.lewis@stripped @@ -123,11 +123,6 @@ if we are compiling on Windows. */ /* We only try to do explicit inlining of functions with gcc and Sun Studio */ -# if !defined(__GNUC__) && !(defined(__SUNPRO_C) || defined(__SUNPRO_CC)) -# undef UNIV_MUST_NOT_INLINE /* Remove compiler warning */ -# define UNIV_MUST_NOT_INLINE -# endif - # ifdef HAVE_PREAD # define HAVE_PWRITE # endif @@ -270,14 +265,14 @@ easy way to get it to work. See http://b # define UNIV_INLINE static __inline__ #endif -#else +#else /* !UNIV_MUST_NOT_INLINE */ /* If we want to compile a noninlined version we use the following macro definitions: */ #define UNIV_NONINL #define UNIV_INLINE UNIV_INTERN -#endif /* UNIV_DEBUG */ +#endif /* !UNIV_MUST_NOT_INLINE */ #ifdef _WIN32 #define UNIV_WORD_SIZE 4 --===============0746920720== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/kevin.lewis@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: kevin.lewis@stripped # target_branch: file:///Users/kevinlewis/Work/Mysql/58629/mysql-\ # trunk-innodb/ # testament_sha1: c071594d3edde6013dba7ad070358010febac234 # timestamp: 2011-01-05 09:18:28 -0600 # base_revision_id: jimmy.yang@stripped\ # wos6whpf5vawvgjv # # Begin bundle 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 --===============0746920720==--