bzr push into mysql-5.1-innodb branch (vasil.dimov:3678 to 3679) Bug#59327

[vasil.dimov]

 3679 Vasil Dimov	2011-01-07
      Fix Bug#59327 Fix autoconf usage for innodb_plugin
      
      AC_CHECK_FUNCS(f1 f2 f3, ACTION_IF_PRESENT)
      ACTION_IF_PRESENT is executed if any of f1, f2 or f3 is present.
      Fix this misusage, we want the action to be executed if all of the
      functions are present.

    modified:
      storage/innodb_plugin/plug.in
 3678 Jimmy Yang	2011-01-06
      Fix Bug #55397 cannot select from innodb_trx when trx_query contains blobs
      that aren't strings
      
      rb://560 approved by Sunny Bains

    modified:
      storage/innodb_plugin/ChangeLog
      storage/innodb_plugin/handler/i_s.cc
      storage/innodb_plugin/include/trx0i_s.h
      storage/innodb_plugin/trx/trx0i_s.c
=== modified file 'storage/innodb_plugin/plug.in'
--- a/storage/innodb_plugin/plug.in	revid:jimmy.yang@stripped
+++ b/storage/innodb_plugin/plug.in	revid:vasil.dimov@stripped
@@ -139,16 +139,20 @@ MYSQL_PLUGIN_ACTIONS(innodb_plugin,  [
   )
 
   AC_MSG_CHECKING(whether Solaris libc atomic functions are available)
-  # either define HAVE_IB_SOLARIS_ATOMICS or not
-  AC_CHECK_FUNCS(atomic_cas_ulong \
-		 atomic_cas_32 \
-		 atomic_cas_64 \
-		 atomic_add_long_nv \
-		 atomic_swap_uchar,
-
-		 AC_DEFINE([HAVE_IB_SOLARIS_ATOMICS], [1],
-			   [Define to 1 if Solaris libc atomic functions \
-			    are available])
+  # Define HAVE_IB_SOLARIS_ATOMICS if _all_ of the following
+  # functions are present.
+  AC_CHECK_FUNC(atomic_add_long_nv,
+    AC_CHECK_FUNC(atomic_cas_32,
+      AC_CHECK_FUNC(atomic_cas_64,
+        AC_CHECK_FUNC(atomic_cas_ulong,
+          AC_CHECK_FUNC(atomic_swap_uchar,
+            AC_DEFINE([HAVE_IB_SOLARIS_ATOMICS], [1],
+              [Define to 1 if Solaris libc atomic functions are available]
+            )
+          )
+        )
+      )
+    )
   )
 
   AC_MSG_CHECKING(whether pthread_t can be used by Solaris libc atomic functions)

No bundle (reason: useless for push emails).