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

 3984 Martin Skold	2012-09-03
      Removed compiler warning

    modified:
      storage/ndb/test/ndbapi/testRedo.cpp
 3983 Martin Skold	2012-09-03
      Removed compiler warnings

    modified:
      client/mysqltest.cc
      tests/mysql_client_fw.c
 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 'client/mysqltest.cc'
--- a/client/mysqltest.cc	2012-08-13 09:33:22 +0000
+++ b/client/mysqltest.cc	2012-09-03 09:44:15 +0000
@@ -4783,7 +4783,7 @@ typedef struct
 
 static st_error global_error_names[] =
 {
-  { "<No error>", -1U, "" },
+  { "<No error>", -1, "" },
 #include <mysqld_ername.h>
   { 0, 0, 0 }
 };

=== 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 09:44:56 +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 'tests/mysql_client_fw.c'
--- a/tests/mysql_client_fw.c	2012-07-09 14:39:29 +0000
+++ b/tests/mysql_client_fw.c	2012-09-03 09:44:15 +0000
@@ -49,8 +49,8 @@ static unsigned int iter_count= 0;
 static my_bool have_innodb= FALSE;
 static char *opt_plugin_dir= 0, *opt_default_auth= 0;
 
-static const char *opt_basedir= "./";
-static const char *opt_vardir= "mysql-test/var";
+static char *opt_basedir= (char *) "./";
+static char *opt_vardir= (char *) "mysql-test/var";
 
 static longlong opt_getopt_ll_test= 0;
 
@@ -67,7 +67,7 @@ NullS
 static time_t start_time, end_time;
 static double total_time;
 
-const char *default_dbug_option= "d:t:o,/tmp/mysql_client_test.trace";
+static char *default_dbug_option= (char *) "d:t:o,/tmp/mysql_client_test.trace";
 
 struct my_tests_st
 {

No bundle (reason: useless for push emails).