List:Commits« Previous MessageNext Message »
From:marko.makela Date:October 27 2010 6:48am
Subject:bzr push into mysql-next-mr-innodb branch (marko.makela:3270 to 3271)
View as plain text  
 3271 Marko Mäkelä	2010-10-27 [merge]
      Merge from mysql-trunk-innodb to mysql-next-mr-innodb.

    modified:
      storage/innobase/include/univ.i
 3270 Sunny Bains	2010-10-27 [merge]
      Merge from mysql-trunk-innodb to mysql-next-mr-innodb.

    modified:
      storage/innobase/handler/ha_innodb.cc
=== modified file 'storage/innobase/include/univ.i'
--- a/storage/innobase/include/univ.i	revid:sunny.bains@strippedmrb7w
+++ b/storage/innobase/include/univ.i	revid:marko.makela@stripped
@@ -78,19 +78,6 @@ the virtual method table (vtable) in GCC
 # define ha_innobase ha_innodb
 #endif /* MYSQL_DYNAMIC_PLUGIN */
 
-/* if any of the following macros is defined at this point this means
-that the code from the "right" plug.in was executed and we do not
-need to include ut0auxconf.h which would either define the same macros
-or will be empty */
-#if !defined(HAVE_IB_GCC_ATOMIC_BUILTINS) \
- && !defined(HAVE_IB_ATOMIC_PTHREAD_T_GCC) \
- && !defined(HAVE_IB_SOLARIS_ATOMICS) \
- && !defined(HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS) \
- && !defined(SIZEOF_PTHREAD_T) \
- && !defined(HAVE_IB_PAUSE_INSTRUCTION)
-# include "ut0auxconf.h"
-#endif
-
 #if (defined(WIN32) || defined(_WIN32) || defined(WIN64) || defined(_WIN64)) && !defined(MYSQL_SERVER) && !defined(__WIN__)
 # undef __WIN__
 # define __WIN__

Attachment: [text/bzr-bundle] bzr/marko.makela@oracle.com-20101027064342-eq5x8kh8vtg9nd8n.bundle
Thread
bzr push into mysql-next-mr-innodb branch (marko.makela:3270 to 3271) marko.makela27 Oct