bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:4003)

[Magnus Blåudd]

#At file:///home/msvensson/mysql/7.0-editline/ based on revid:magnus.blaudd@strippedm

 4003 Magnus Blåudd	2010-11-15
      ndb
       - add printout in ndb_test_platform to describe it's useless purpose
       - don't build ndb_test_platform anymore in 5.5

    modified:
      storage/ndb/tools/CMakeLists.txt
      storage/ndb/tools/ndb_test_platform.cpp
=== modified file 'storage/ndb/tools/CMakeLists.txt'
--- a/storage/ndb/tools/CMakeLists.txt	2010-11-11 13:19:26 +0000
+++ b/storage/ndb/tools/CMakeLists.txt	2010-11-15 09:27:19 +0000
@@ -20,7 +20,6 @@ INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR}
                     ${CMAKE_SOURCE_DIR}/storage/ndb/include/debugger
 )
 
-ADD_EXECUTABLE(ndb_test_platform ndb_test_platform.cpp)
 ADD_EXECUTABLE(ndb_waiter waiter.cpp)
 TARGET_LINK_LIBRARIES(ndb_waiter ndbportlib ndbNDBT)
 ADD_EXECUTABLE(ndb_drop_table drop_tab.cpp)
@@ -63,3 +62,9 @@ ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_SOUR
 ADD_CUSTOM_TARGET(ndbinfo_sql_run ALL
 				  DEPENDS ${PROJECT_SOURCE_DIR}/storage/ndb/tools/ndbinfo.sql)
 
+
+IF (MYSQL_VERSION_ID VERSION_LESS "50501")
+  # Don't build or install this program anymore in 5.5+
+  ADD_EXECUTABLE(ndb_test_platform ndb_test_platform.cpp)
+ENDIF()
+

=== modified file 'storage/ndb/tools/ndb_test_platform.cpp'
--- a/storage/ndb/tools/ndb_test_platform.cpp	2010-10-07 05:39:39 +0000
+++ b/storage/ndb/tools/ndb_test_platform.cpp	2010-11-15 09:27:19 +0000
@@ -68,6 +68,8 @@ int test_snprintf(const char * fmt, int 
 int
 main(void)
 {
+
+  printf("ndb_test_platform - tests for snprintf and pointer size\n");
   /*
    * Test BaseString::snprintf
    */

Attachment: [text/bzr-bundle] bzr/[e-mail]