branches/zip:

Rename HAVE_SOLARIS_ATOMICS to HAVE_IB_SOLARIS_ATOMICS and 
IB_HAVE_PAUSE_INSTRUCTION to HAVE_IB_PAUSE_INSTRUCTION so they
all follow the same HAVE_IB_* convention.

include/os0sync.h

@@ -327,7 +327,7 @@ Returns the old value of *ptr, atomically sets *ptr to new_val */
 # define os_atomic_test_and_set_byte(ptr, new_val) \
 	__sync_lock_test_and_set(ptr, new_val)
 
-#elif defined(HAVE_SOLARIS_ATOMICS)
+#elif defined(HAVE_IB_SOLARIS_ATOMICS)
 
 #define HAVE_ATOMIC_BUILTINS
 

include/univ.i

@@ -84,10 +84,10 @@ 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_SOLARIS_ATOMICS) \
+ && !defined(HAVE_IB_SOLARIS_ATOMICS) \
  && !defined(HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS) \
  && !defined(SIZEOF_PTHREAD_T) \
- && !defined(IB_HAVE_PAUSE_INSTRUCTION)
+ && !defined(HAVE_IB_PAUSE_INSTRUCTION)
 # include "ut0auxconf.h"
 #endif
 

plug.in

@@ -137,13 +137,13 @@ MYSQL_PLUGIN_ACTIONS(innobase,  [
   )
 
   AC_MSG_CHECKING(whether Solaris libc atomic functions are available)
-  # either define HAVE_SOLARIS_ATOMICS or not
+  # either define HAVE_IB_SOLARIS_ATOMICS or not
   AC_CHECK_FUNCS(atomic_add_long \
 		 atomic_cas_32 \
 		 atomic_cas_64 \
 		 atomic_cas_ulong,
 
-		 AC_DEFINE([HAVE_SOLARIS_ATOMICS], [1],
+		 AC_DEFINE([HAVE_IB_SOLARIS_ATOMICS], [1],
 			   [Define to 1 if Solaris libc atomic functions \
 			    are available])
   )
@@ -208,7 +208,7 @@ MYSQL_PLUGIN_ACTIONS(innobase,  [
       }
     ],
     [
-      AC_DEFINE([IB_HAVE_PAUSE_INSTRUCTION], [1], [Does x86 PAUSE instruction exist])
+      AC_DEFINE([HAVE_IB_PAUSE_INSTRUCTION], [1], [Does x86 PAUSE instruction exist])
       AC_MSG_RESULT(yes)
     ],
     [

srv/srv0start.c

@@ -1114,7 +1114,7 @@ innobase_start_or_create_for_mysql(void)
 	fprintf(stderr,
 		"InnoDB: Mutexes use GCC atomic builtins, rw_locks do not.\n");
 # endif /* INNODB_RW_LOCKS_USE_ATOMICS */
-#elif defined(HAVE_SOLARIS_ATOMICS)
+#elif defined(HAVE_IB_SOLARIS_ATOMICS)
 # ifdef INNODB_RW_LOCKS_USE_ATOMICS
 	fprintf(stderr,
 		"InnoDB: Mutexes and rw_locks use Solaris atomic functions.\n");