From: Jonas Oreland
Date: September 29 2011 6:51am
Subject: bzr push into mysql-5.5-cluster branch (jonas.oreland:3538 to 3540)
List-Archive: http://lists.mysql.com/commits/141193
Message-Id: <20110929065129.12833918F12@perch.localdomain>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3540 Jonas Oreland	2011-09-29
      ndb - more mainline compiler warnings...sob sob

    modified:
      support-files/compiler_warnings.supp
 3539 Jonas Oreland	2011-09-29
      ndb - fix incorrect NdbRestarter usage (found by compiler warnings)

    modified:
      storage/ndb/test/ndbapi/testNdbApi.cpp
      storage/ndb/test/ndbapi/testRestartGci.cpp
 3538 Jonas Oreland	2011-09-29
      ndb - fix supressions (there was an extra space after C4244)

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

=== modified file 'storage/ndb/test/ndbapi/testRestartGci.cpp'
--- a/storage/ndb/test/ndbapi/testRestartGci.cpp	2011-09-28 10:46:30 +0000
+++ b/storage/ndb/test/ndbapi/testRestartGci.cpp	2011-09-29 06:49:21 +0000
@@ -486,7 +486,7 @@ int runNodeInitialRestarts(NDBT_Context*
     int nodeId = restarter.getNode(NdbRestarter::NS_RANDOM);
     ndbout_c("Restarting node %u", nodeId);
 
-    if (restarter.restartOneDbNode(nodeId, NdbRestarter::NRRF_INITIAL) != 0)
+    if (restarter.restartOneDbNode2(nodeId, NdbRestarter::NRRF_INITIAL) != 0)
     {
       ndbout_c("Error restarting node");
       ctx->stopTest();

=== modified file 'support-files/compiler_warnings.supp'
--- a/support-files/compiler_warnings.supp	2011-09-29 06:00:10 +0000
+++ b/support-files/compiler_warnings.supp	2011-09-29 06:50:25 +0000
@@ -115,7 +115,7 @@ client/mysqldump.c : .*may be used unini
 mysqlslap/mysqlslap.c : .*
 yassl/.* : C4005: 'WIN32_LEAN_AND_MEAN' : macro redefinition
 mytap/tap.c : C4028: formal parameter .* different from declaration
-mysql/readline.cc : C4101: 'input_file_stat' : unreferenced local variable
+.*/readline.cc : C4101: 'input_file_stat' : unreferenced local variable
 
 #
 # 
@@ -131,7 +131,23 @@ mysql/readline.cc : C4101: 'input_file_s
 .*/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
-
+.*/myisamchk.c            : .*C4244.* conversion .* possible loss of data
+.*/log_event.cc           : .*C4244.* conversion .* possible loss of data
+.*/log.cc                 : .*C4244.* conversion .* possible loss of data
+.*/item_timefunc.cc       : .*C4244.* conversion .* possible loss of data
+.*/mysqld.cc              : .*C4244.* conversion .* possible loss of data
+.*/item.cc                : .*C4244.* conversion .* possible loss of data
+.*/ha_partition.cc        : .*C4244.* conversion .* possible loss of data
+.*/sql_db.cc              : .*C4305.*
+.*/sql_cache.cc           : .*C4244.* conversion .* possible loss of data
+.*/sp.cc                  : .*C4244.* conversion .* possible loss of data
+.*/sp_head.cc             : .*C4244.* conversion .* possible loss of data
+.*/sql_insert.cc          : .*C4244.* conversion .* possible loss of data
+.*/parse_file.cc          : .*C4244.* conversion .* possible loss of data
+.*/sql_acl.cc             : .*C4244.* conversion .* possible loss of data
+.*/handler.cc             : .*C4244.* conversion .* possible loss of data
+.*/discover.cc            : .*C4244.* conversion .* possible loss of data
+.*/ha_archive.cc          : .*C4244.* conversion .* possible loss of data
 
 # const qualifiers
 replace/replace.c                     : .*C4090.*
@@ -144,4 +160,5 @@ mysqldump/mysqldump.c                 :
 .*/mysql_client_test.c                : .*C4090.*
 myisampack/myisampack.c               : .*C4090.*
 my_print_defaults/my_print_defaults.c : .*C4090.*
-
+myisamchk/myisamchk.c                 : .*C4090.*
+mysqlimport/mysqlimport.c             : .*C4090.*

No bundle (reason: useless for push emails).