bzr push into mysql-5.1 branch (build:2795 to 2799)

[MySQL Build Team]

 2799 MySQL Build Team	2009-02-01
      Use AC_TRY_RUN instead of AC_TRY_LINK when checking for x86 PAUSE instruction support, due to http://bugs.opensolaris.org/bugdatabase/printableBug.do?bug_id=6478684 .
modified:
  configure.in

 2798 MySQL Build Team	2009-01-28
      Use sun_prefetch_read_many() and friends, instead of sparc_prefetch_read_many(),
      etc.  The sparc_* are defined only for sparc, but the sun_* are generic for x86
      and sparc (and are defined empty for any other platform).
modified:
  storage/innobase/include/univ.i
  storage/ndb/include/portlib/prefetch.h

 2797 MySQL Build Team	2009-01-28
      Ensure that include/atomic/solaris.h is in distribution
modified:
  include/Makefile.am

 2796 MySQL Build Team	2009-01-28
      Fix dependency issue for dtrace
modified:
  sql/Makefile.am

 2795 Alexey Kopytov	2008-12-30
      Fixed the circular dependency in a DTrace-related Makefile part.
modified:
  sql/Makefile.am

=== modified file 'configure.in'
--- a/configure.in	2008-12-20 15:15:46 +0000
+++ b/configure.in	2009-02-01 01:34:39 +0000
@@ -2357,10 +2357,20 @@ fi
 
 #Check for x86 PAUSE instruction
 AC_MSG_CHECKING("for x86 PAUSE instruction")
-AC_TRY_COMPILE(
-[],
-[{__asm__ __volatile__ ("pause");}],
-x86_pause_exists=yes, x86_pause_exists=no)
+# We have to actually try running the test program, because of a bug
+# in Solaris on x86_64, where it wrongly reports that PAUSE is not
+# supported when trying to run an application.  See
+# http://bugs.opensolaris.org/bugdatabase/printableBug.do?bug_id=6478684
+AC_TRY_RUN([
+    int main() {
+      __asm__ __volatile__ ("pause");
+      return 0;
+    }
+  ],
+  [x86_pause_exists=yes],
+  [x86_pause_exists=no],
+  [x86_pause_exists=no]  # Cross-compile, assume no PAUSE instruction
+)
 if test "$x86_pause_exists" = "yes"
 then
   AC_DEFINE([HAVE_PAUSE_INSTRUCTION], [1], [Does x86 PAUSE instruction exist])

=== modified file 'include/Makefile.am'
--- a/include/Makefile.am	2008-12-20 10:53:27 +0000
+++ b/include/Makefile.am	2009-01-28 12:47:44 +0000
@@ -39,6 +39,7 @@ noinst_HEADERS =	config-win.h config-net
 			my_handler.h my_time.h \
 			my_vle.h my_user.h my_atomic.h atomic/nolock.h \
 			atomic/rwlock.h atomic/x86-gcc.h atomic/x86-msvc.h \
+                        atomic/solaris.h \
 			atomic/gcc_builtins.h my_libwrap.h my_stacktrace.h \
 			probes_mysql.h probes_mysql_nodtrace.h
 

=== modified file 'sql/Makefile.am'
--- a/sql/Makefile.am	2008-12-30 11:27:21 +0000
+++ b/sql/Makefile.am	2009-01-27 23:04:05 +0000
@@ -226,8 +226,10 @@ probes_all.o: probes_mysql.d $(DTRACEFIL
 	objects=`for i in $(DTRACEDIRS); do f=\`cat $$i/dtrace_files 2>/dev/null\`; for j in $$f; do test -f $$i/$$j && echo "$$i/$$j "; done; done`; \
 	$(DTRACE) $(DTRACEFLAGS) -G $$providers $$objects -o $@
 
-probes_libndb.o: probes_mysql.d
-	$(DTRACE) $(DTRACEFLAGS) -G -s $^ .libs/libndb_la-ha_ndbcluster.o -o $@
+# Can't depend directly on .libs/*.o, because there is no generated rule for
+# that in the Makefile; it is a byproduct of *.lo
+probes_libndb.o: probes_mysql.d libndb_la-ha_ndbcluster.lo
+	$(DTRACE) $(DTRACEFLAGS) -G -s probes_mysql.d .libs/libndb_la-ha_ndbcluster.o -o $@
 endif
 
 # Don't update the files from bitkeeper

=== modified file 'storage/innobase/include/univ.i'
--- a/storage/innobase/include/univ.i	2008-10-30 09:23:36 +0000
+++ b/storage/innobase/include/univ.i	2009-01-28 21:17:20 +0000
@@ -291,8 +291,8 @@ it is read or written. */
 #elif defined(__SUNPRO_C)
 # define UNIV_EXPECT(expr,value) (expr)
 # define UNIV_LIKELY_NULL(expr) (expr)
-# define UNIV_PREFETCH_R(addr) sparc_prefetch_read_many(addr)
-# define UNIV_PREFETCH_RW(addr) sparc_prefetch_write_many(addr)
+# define UNIV_PREFETCH_R(addr) sun_prefetch_read_many(addr)
+# define UNIV_PREFETCH_RW(addr) sun_prefetch_write_many(addr)
 #else
 /* Dummy versions of the macros */
 # define UNIV_EXPECT(expr,value) (expr)

=== modified file 'storage/ndb/include/portlib/prefetch.h'
--- a/storage/ndb/include/portlib/prefetch.h	2006-12-23 19:20:40 +0000
+++ b/storage/ndb/include/portlib/prefetch.h	2009-01-28 21:17:20 +0000
@@ -43,7 +43,7 @@ inline void prefetch(void* p)
    __asm(" ldl r31,0(a0);", p);
 #endif /* NDB_ALPHA */
 #ifdef NDB_FORTE6
-  sparc_prefetch_read_once(p);
+  sun_prefetch_read_once(p);
 #else 
   (void)p;
 #endif
@@ -55,7 +55,7 @@ inline void writehint(void* p)
    __asm(" wh64 (a0);", p);
 #endif /* NDB_ALPHA */
 #ifdef NDB_FORTE6
-  sparc_prefetch_write_once(p);
+  sun_prefetch_write_once(p);
 #else
   (void)p;
 #endif