branches/zip:

As suggested by Ken, print a message that says that the Google SMP patch
(GCC atomics) is disabled if it is. Also extend the message when the patch
is partially enabled to make it clear that it is partially enabled.

srv/srv0start.c

@@ -1085,13 +1085,15 @@ innobase_start_or_create_for_mysql(void)
 #ifdef HAVE_GCC_ATOMIC_BUILTINS
 #ifdef INNODB_RW_LOCKS_USE_ATOMICS
 	fprintf(stderr,
-		"InnoDB: Mutex and rw_lock use GCC atomic builtins.\n");
-#else
+		"InnoDB: Mutexes and rw_locks use GCC atomic builtins.\n");
+#else /* INNODB_RW_LOCKS_USE_ATOMICS */
 	fprintf(stderr,
-		"InnoDB: Mutex use GCC atomic builtins.\n");
-#endif
-
-#endif
+		"InnoDB: Mutexes use GCC atomic builtins, rw_locks do not.\n");
+#endif /* INNODB_RW_LOCKS_USE_ATOMICS */
+#else /* HAVE_GCC_ATOMIC_BUILTINS */
+	fprintf(stderr,
+		"InnoDB: Neither mutexes nor rw_locks use GCC atomic builtins.\n");
+#else /* HAVE_GCC_ATOMIC_BUILTINS */
 
 	/* Since InnoDB does not currently clean up all its internal data
 	structures in MySQL Embedded Server Library server_end(), we