bzr push into mysql-trunk-innodb branch (marko.makela:3288 to 3289)

[marko.makela]

 3289 Marko Mäkelä	2010-10-27
      Remove a reference to ut0auxconf.h,
      which was needed when the InnoDB Plugin 1.0 was distributed
      separately from MySQL 5.1. Somehow, this reference was not removed
      when the corresponding change was merged from mysql-5.5-innodb
      revision-id: marko.makela@stripped5w7zyzbv10nvi1

    modified:
      storage/innobase/include/univ.i
 3288 Sunny Bains	2010-10-27
      Fix formatting and whitespace.

    modified:
      storage/innobase/handler/ha_innodb.cc
=== modified file 'storage/innobase/include/univ.i'
--- a/storage/innobase/include/univ.i	revid:sunny.bains@stripped3
+++ 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/[e-mail]