bzr push into mysql-5.5-cluster branch (jonas.oreland:3532 to 3538)

[Jonas Oreland]

 3538 Jonas Oreland	2011-09-29
      ndb - fix supressions (there was an extra space after C4244)

    modified:
      support-files/compiler_warnings.supp
 3537 Jonas Oreland	2011-09-29
      ndb - add cmake output about 32/64 bit build

    modified:
      storage/ndb/CMakeLists.txt
 3536 Jonas Oreland	2011-09-29
      ndb - compiler warning

    modified:
      storage/ndb/test/ndbapi/testNdbApi.cpp
 3535 Jonas Oreland	2011-09-29
      ndb - compiler warning

    modified:
      storage/ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp
 3534 Jonas Oreland	2011-09-29
      ndb - another attempt at fixing warning (online alter code)

    modified:
      sql/sql_partition.cc
 3533 Jonas Oreland	2011-09-29
      ndb - compiler warning

    modified:
      storage/ndb/src/common/util/ndbzio.c
 3532 Jonas Oreland	2011-09-28
      ndb - add new suppressions for mainline, found on windows7, Visual Studio 9 2008

    modified:
      support-files/compiler_warnings.supp
=== modified file 'sql/sql_partition.cc'
--- a/sql/sql_partition.cc	2011-09-28 11:43:12 +0000
+++ b/sql/sql_partition.cc	2011-09-29 05:46:22 +0000
@@ -4651,7 +4651,7 @@ uint prep_alter_part_table(THD *thd, TAB
       if (tab_part_info->part_type != HASH_PARTITION ||
           ((table->s->db_type()->partition_flags() & HA_USE_AUTO_PARTITION) &&
            !tab_part_info->use_default_num_partitions) ||
-          ((!table->s->db_type()->partition_flags() & HA_USE_AUTO_PARTITION) &&
+          ((!(table->s->db_type()->partition_flags() & HA_USE_AUTO_PARTITION))&&
            tab_part_info->use_default_num_partitions))
 #else
       if (tab_part_info->part_type != HASH_PARTITION ||

=== modified file 'storage/ndb/CMakeLists.txt'
--- a/storage/ndb/CMakeLists.txt	2011-09-23 12:40:40 +0000
+++ b/storage/ndb/CMakeLists.txt	2011-09-29 05:59:15 +0000
@@ -109,7 +109,11 @@ IF (NOT DEFINED WITH_NDBCLUSTER)
   RETURN()
 ENDIF()
 
-MESSAGE(STATUS "Building NDB")
+IF(CMAKE_SIZEOF_VOID_P EQUAL 4)
+  MESSAGE(STATUS "Building NDB 32-bit")
+ELSE()
+  MESSAGE(STATUS "Building NDB 64-bit")
+ENDIF()
 
 INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/ndb_configure.cmake)
 

=== modified file 'storage/ndb/src/common/util/ndbzio.c'
--- a/storage/ndb/src/common/util/ndbzio.c	2011-07-05 12:46:07 +0000
+++ b/storage/ndb/src/common/util/ndbzio.c	2011-09-29 05:44:30 +0000
@@ -1070,6 +1070,6 @@ int ndbz_file_size(ndbzio_stream *s, siz
   if (my_fstat(s->file, &stat_buf, 0) != 0)
     return -1;
 
-  *size = stat_buf.st_size;
+  *size = (size_t)stat_buf.st_size;
   return 0; /* OK */
 }

=== modified file 'storage/ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp'
--- a/storage/ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp	2011-06-30 15:59:25 +0000
+++ b/storage/ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp	2011-09-29 05:47:22 +0000
@@ -244,7 +244,7 @@ NDB_COMMAND(printSchemafile,
       exitcode = 1;
       continue;
     }
-    const Uint32 bytes = sbuf.st_size;
+    const Uint32 bytes = (Uint32)sbuf.st_size;
     
     Uint32 * buf = new Uint32[bytes/4+1];
     

=== modified file 'storage/ndb/test/ndbapi/testNdbApi.cpp'
--- a/storage/ndb/test/ndbapi/testNdbApi.cpp	2011-09-28 10:46:30 +0000
+++ b/storage/ndb/test/ndbapi/testNdbApi.cpp	2011-09-29 05:48:47 +0000
@@ -4826,8 +4826,8 @@ runRestarts(NDBT_Context* ctx, NDBT_Step
       }
 
       ndbout << "Restart cluster" << endl;
-      if (restarter.restartAll(NdbRestarter::NRRF_NOSTART |
-                               NdbRestarter::NRRF_ABORT) != 0)
+      if (restarter.restartAll(Uint32(NdbRestarter::NRRF_NOSTART |
+                                      NdbRestarter::NRRF_ABORT)) != 0)
       {
         g_err << "Failed to restartAll" << endl;
         result = NDBT_FAILED;

=== modified file 'support-files/compiler_warnings.supp'
--- a/support-files/compiler_warnings.supp	2011-09-28 12:15:26 +0000
+++ b/support-files/compiler_warnings.supp	2011-09-29 06:00:10 +0000
@@ -120,17 +120,17 @@ mysql/readline.cc : C4101: 'input_file_s
 #
 # 
 #
-.*/sys_vars.h: C4244 .* conversion .* possible loss of data
-.*/mi_dynrec.c : C4244 .* conversion .* possible loss of data
-.*/mi_check.c : C4244 .* conversion .* possible loss of data
-.*/sys_vars.cc : C4244 .* conversion .* possible loss of data
-.*/partition_info.cc : C4244 .* conversion .* possible loss of data
-.*/sql_time.cc : C4244 .* conversion .* possible loss of data
-.*/sql_view.cc : C4244 .* conversion .* possible loss of data
-.*/event_db_repository.cc : C4244 .* conversion .* possible loss of data
-.*/sql_trigger.cc : C4244 .* conversion .* possible loss of data
-.*/sql_table.cc : C4244 .* conversion .* possible loss of data
-.*/sql_show.cc : C4244 .* conversion .* possible loss of data
+.*/sys_vars.h             : .*C4244.* conversion .* possible loss of data
+.*/mi_dynrec.c            : .*C4244.* conversion .* possible loss of data
+.*/mi_check.c             : .*C4244.* conversion .* possible loss of data
+.*/sys_vars.cc            : .*C4244.* conversion .* possible loss of data
+.*/partition_info.cc      : .*C4244.* conversion .* possible loss of data
+.*/sql_time.cc            : .*C4244.* conversion .* possible loss of data
+.*/sql_view.cc            : .*C4244.* conversion .* possible loss of data
+.*/event_db_repository.cc : .*C4244.* conversion .* possible loss of data
+.*/sql_trigger.cc         : .*C4244.* conversion .* possible loss of data
+.*/sql_table.cc           : .*C4244.* conversion .* possible loss of data
+.*/sql_show.cc            : .*C4244.* conversion .* possible loss of data
 
 
 # const qualifiers

No bundle (reason: useless for push emails).