From: magnus.blaudd
Date: June 27 2012 12:59pm
Subject: bzr push into mysql-5.5-cluster-7.3 branch (magnus.blaudd:3895 to 3896)
List-Archive: http://lists.mysql.com/commits/144331
Message-Id: <20120627125903.8837.28588.3896@peek02.se.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3896 magnus.blaudd@stripped	2012-06-27 [merge]
      Merge 7.1 -> 7.3

    modified:
      sql/ha_ndbcluster_binlog.cc
 3895 magnus.blaudd@stripped	2012-06-26 [merge]
      Merge 7.2 -> 7.3

    added:
      mysql-test/suite/ndb/r/ndb_mgmd.result
      mysql-test/suite/ndb/t/ndb_mgmd.cnf
      mysql-test/suite/ndb/t/ndb_mgmd.test
    modified:
      storage/ndb/include/logger/FileLogHandler.hpp
      storage/ndb/include/logger/LogHandler.hpp
      storage/ndb/include/logger/Logger.hpp
      storage/ndb/src/common/logger/LogHandler.cpp
      storage/ndb/src/common/logger/Logger.cpp
      storage/ndb/src/mgmsrv/MgmtSrvr.cpp
      storage/ndb/src/mgmsrv/MgmtSrvr.hpp
      storage/ndb/src/ndbapi/NdbScanOperation.cpp
      storage/ndb/src/ndbapi/ndberror.c
      storage/ndb/test/ndbapi/testScan.cpp
      storage/ndb/test/run-test/daily-basic-tests.txt
      storage/ndb/tools/ndb_error_reporter
=== modified file 'sql/ha_ndbcluster_binlog.cc'
--- a/sql/ha_ndbcluster_binlog.cc	2012-06-15 10:08:39 +0000
+++ b/sql/ha_ndbcluster_binlog.cc	2012-06-27 12:54:44 +0000
@@ -1107,7 +1107,7 @@ static void clean_away_stray_files(THD *
   char path[FN_REFLEN + 1];
  
   DBUG_ENTER("clean_away_stray_files");
-  bzero((char*) &lookup_field_values, sizeof(LOOKUP_FIELD_VALUES));
+  memset(&lookup_field_values, 0, sizeof(LOOKUP_FIELD_VALUES));
   if (make_db_list(thd, &db_names, &lookup_field_values, &with_i_schema))
   {
     thd->clear_error();

No bundle (reason: useless for push emails).