From: Martin Skold
Date: September 3 2012 12:32pm
Subject: bzr push into mysql-5.5-cluster-7.2 branch (Martin.Skold:3982 to 3984)
List-Archive: http://lists.mysql.com/commits/144682
Message-Id: <20120903123227.546ED9F8D7F@quadfish>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3984 Martin Skold	2012-09-03
      Supressed warnings imported from mysql-5.5

    modified:
      support-files/compiler_warnings.supp
 3983 Martin Skold	2012-09-03
      Removed compiler warning

    modified:
      storage/ndb/test/ndbapi/testRedo.cpp
 3982 Maitrayi Sabaratnam	2012-08-29 [merge]
      Merge from 71 to 72

    modified:
      storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
      storage/ndb/test/ndbapi/testDict.cpp
=== modified file 'storage/ndb/test/ndbapi/testRedo.cpp'
--- a/storage/ndb/test/ndbapi/testRedo.cpp	2012-08-13 14:03:42 +0000
+++ b/storage/ndb/test/ndbapi/testRedo.cpp	2012-09-03 12:31:01 +0000
@@ -1324,7 +1324,7 @@ main(int argc, const char** argv)
   ndb_init();
   NDBT_TESTSUITE_INSTANCE(testRedo);
   testRedo.setCreateTable(false);
-  myRandom48Init(NdbTick_CurrentMillisecond());
+  myRandom48Init((long)NdbTick_CurrentMillisecond());
   g_msgmutex = NdbMutex_Create();
   require(g_msgmutex != 0);
   int ret = testRedo.execute(argc, argv);

=== modified file 'support-files/compiler_warnings.supp'
--- a/support-files/compiler_warnings.supp	2012-03-30 07:53:09 +0000
+++ b/support-files/compiler_warnings.supp	2012-09-03 12:31:51 +0000
@@ -112,6 +112,7 @@ mysqlslap/mysqlslap.c : .*
 yassl/.* : C4005: 'WIN32_LEAN_AND_MEAN' : macro redefinition
 mytap/tap.c : C4028: formal parameter .* different from declaration
 .*/readline.cc : C4101: 'input_file_stat' : unreferenced local variable
+mysqltest/mysqltest.cc: C4146: unary minus operator applied to unsigned type, result still unsigned
 
 #
 .*/sys_vars.h             : .*C4244.* conversion .* possible loss of data
@@ -160,6 +161,7 @@ my_print_defaults/my_print_defaults.c : 
 myisamchk/myisamchk.c                 : .*C4090.*
 mysqlimport/mysqlimport.c             : .*C4090.*
 mysqlcheck/mysqlcheck.c               : .*C4090.*
+tests/mysql_client_fw.c               : .*C4090.*
 
 #
 # Bundled memcached and libevent

No bundle (reason: useless for push emails).