bzr push into mysql-5.5-telco-7.0 branch (magnus.blaudd:3117 to 3118)

[Magnus Blåudd]

 3118 Magnus Blåudd	2010-11-11 [merge]
      Merge 7.0 -> 5.5-telco-7.0

    modified:
      storage/ndb/include/portlib/ndb_prefetch.h
      storage/ndb/src/common/debugger/CMakeLists.txt
      storage/ndb/src/common/logger/CMakeLists.txt
      storage/ndb/src/common/util/CMakeLists.txt
      storage/ndb/src/mgmapi/CMakeLists.txt
      storage/ndb/src/mgmsrv/CMakeLists.txt
 3117 Magnus Blåudd	2010-11-11 [merge]
      Merge 7.0 -> 5.5-telco-7.0

    modified:
      storage/ndb/include/ndb_global.h
      storage/ndb/src/mgmapi/Makefile.am
      storage/ndb/src/mgmsrv/CMakeLists.txt
      storage/ndb/src/mgmsrv/Makefile.am
      storage/ndb/tools/CMakeLists.txt
      storage/ndb/tools/Makefile.am
=== modified file 'storage/ndb/include/portlib/ndb_prefetch.h'
--- a/storage/ndb/include/portlib/ndb_prefetch.h	2010-11-11 09:57:52 +0000
+++ b/storage/ndb/include/portlib/ndb_prefetch.h	2010-11-11 15:31:52 +0000
@@ -20,6 +20,14 @@
 
 #ifdef HAVE_SUN_PREFETCH_H
 #include <sun_prefetch.h>
+#if (defined(__SUNPRO_C) && __SUNPRO_C >= 0x590) \
+    || (defined(__SUNPRO_CC) && __SUNPRO_CC >= 0x590)
+/* Universal sun_prefetch* macros available with Sun Studio 5.9 */
+#define USE_SUN_PREFETCH
+#elif defined(__sparc)
+/* Use sparc_prefetch* macros with older Sun Studio on sparc */
+#define USE_SPARC_PREFETCH
+#endif
 #endif
 
 #ifdef HAVE_SUN_PREFETCH_H
@@ -31,8 +39,10 @@ void NDB_PREFETCH_READ(void* addr)
 {
 #if (__GNUC__ > 3) || (__GNUC__ == 3 && __GNUC_MINOR > 10)
   __builtin_prefetch(addr, 0, 3);
-#elif defined(HAVE_SUN_PREFETCH_H)
+#elif defined(USE_SUN_PREFETCH)
   sun_prefetch_read_once(addr);
+#elif defined(USE_SPARC_PREFETCH)
+  sparc_prefetch_read_once(addr);
 #else
   (void)addr;
 #endif
@@ -43,7 +53,9 @@ void NDB_PREFETCH_WRITE(void* addr)
 {
 #if (__GNUC__ > 3) || (__GNUC__ == 3 && __GNUC_MINOR > 10)
   __builtin_prefetch(addr, 1, 3);
-#elif defined(HAVE_SUN_PREFETCH_H)
+#elif defined(USE_SUN_PREFETCH)
+  sun_prefetch_write_once(addr);
+#elif defined(USE_SPARC_PREFETCH)
   sun_prefetch_write_once(addr);
 #else
   (void)addr;

=== modified file 'storage/ndb/src/common/debugger/CMakeLists.txt'
--- a/storage/ndb/src/common/debugger/CMakeLists.txt	2009-06-03 15:38:04 +0000
+++ b/storage/ndb/src/common/debugger/CMakeLists.txt	2010-11-11 15:08:52 +0000
@@ -24,4 +24,4 @@ ADD_LIBRARY(ndbtrace STATIC
             BlockNames.cpp
             EventLogger.cpp)
 
-TARGET_LINK_LIBRARIES(ndbtrace ndbgeneral)
+TARGET_LINK_LIBRARIES(ndbtrace ndblogger ndberror ndbgeneral)

=== modified file 'storage/ndb/src/common/logger/CMakeLists.txt'
--- a/storage/ndb/src/common/logger/CMakeLists.txt	2010-10-19 15:03:27 +0000
+++ b/storage/ndb/src/common/logger/CMakeLists.txt	2010-11-11 15:08:52 +0000
@@ -24,3 +24,4 @@ ADD_LIBRARY(ndblogger STATIC
 	    SysLogHandler.cpp
             EventLogHandler.cpp
             FileLogHandler.cpp)
+TARGET_LINK_LIBRARIES(ndblogger ndbgeneral)

=== modified file 'storage/ndb/src/common/util/CMakeLists.txt'
--- a/storage/ndb/src/common/util/CMakeLists.txt	2010-10-29 08:40:49 +0000
+++ b/storage/ndb/src/common/util/CMakeLists.txt	2010-11-11 15:08:52 +0000
@@ -55,7 +55,7 @@ ADD_LIBRARY(ndbgeneral STATIC
 	    SparseBitmask.cpp
             require.c
 )
-TARGET_LINK_LIBRARIES(ndbgeneral ${ZLIB_LIBRARY} mysys)
+TARGET_LINK_LIBRARIES(ndbgeneral ndbtrace ${ZLIB_LIBRARY} mysys)
 
 ADD_EXECUTABLE(BaseString-t BaseString.cpp)
 SET_TARGET_PROPERTIES(BaseString-t

=== modified file 'storage/ndb/src/mgmapi/CMakeLists.txt'
--- a/storage/ndb/src/mgmapi/CMakeLists.txt	2010-10-19 12:19:31 +0000
+++ b/storage/ndb/src/mgmapi/CMakeLists.txt	2010-11-11 15:08:52 +0000
@@ -27,4 +27,4 @@ ADD_LIBRARY(ndbmgmapi STATIC
             mgmapi_configuration.cpp
             LocalConfig.cpp
             ${CMAKE_SOURCE_DIR}/storage/ndb/src/kernel/error/ndbd_exit_codes.c)
-TARGET_LINK_LIBRARIES(ndbmgmapi ndbconf)
+TARGET_LINK_LIBRARIES(ndbmgmapi ndbconf ndbportlib)

=== modified file 'storage/ndb/src/mgmsrv/CMakeLists.txt'
--- a/storage/ndb/src/mgmsrv/CMakeLists.txt	2010-11-11 13:19:26 +0000
+++ b/storage/ndb/src/mgmsrv/CMakeLists.txt	2010-11-11 15:08:52 +0000
@@ -23,6 +23,7 @@ ADD_LIBRARY(ndbconf
                ConfigInfo.cpp
                InitConfigFileParser.cpp
 )
+TARGET_LINK_LIBRARIES(ndbconf ndbmgmapi)
 
 # Define MYSQLCLUSTERDIR, the default location
 # of ndb_mgmd config files

No bundle (reason: useless for push emails).