bzr push into mysql-5.1-telco-7.1 branch (jonas:3890 to 3891)

[Jonas Oreland]

 3891 Jonas Oreland	2010-10-15 [merge]
      ndb - merge 70 to 71

    modified:
      sql/ha_ndbcluster_binlog.cc
      storage/ndb/include/mgmapi/mgmapi_config_parameters.h
      storage/ndb/src/ndbapi/ClusterMgr.cpp
 3890 Magnus Blåudd	2010-10-15 [merge]
      Merge 7.0 -> 7.1

    modified:
      client/mysqltest.cc
      sql/ha_ndbcluster.cc
      sql/slave.cc
      storage/ndb/src/mgmsrv/MgmtSrvr.cpp
      storage/ndb/src/mgmsrv/MgmtSrvr.hpp
      support-files/compiler_warnings.supp
=== modified file 'sql/ha_ndbcluster_binlog.cc'
--- a/sql/ha_ndbcluster_binlog.cc	2010-09-29 11:01:55 +0000
+++ b/sql/ha_ndbcluster_binlog.cc	2010-10-15 13:02:59 +0000
@@ -4895,7 +4895,8 @@ ndbcluster_drop_event(THD *thd, Ndb *ndb
     if (!dict->dropEvent(event_name.c_ptr()))
       continue;
 
-    if (dict->getNdbError().code != 4710)
+    if (dict->getNdbError().code != 4710 &&
+        dict->getNdbError().code != 1419)
     {
       /* drop event failed for some reason, issue a warning */
       push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_ERROR,

=== modified file 'storage/ndb/include/mgmapi/mgmapi_config_parameters.h'
--- a/storage/ndb/include/mgmapi/mgmapi_config_parameters.h	2010-10-13 12:22:51 +0000
+++ b/storage/ndb/include/mgmapi/mgmapi_config_parameters.h	2010-10-15 13:02:11 +0000
@@ -173,7 +173,9 @@
 #define CFG_DB_MAX_START_FAIL         609 /* For StopOnError=0 */
 #define CFG_DB_START_FAIL_DELAY_SECS  610 /* For StopOnError=0 */
 
-#define CFG_DB_EVENTLOG_BUFFER_SIZE   611
+/* 611 & 612 reserved */
+
+#define CFG_DB_EVENTLOG_BUFFER_SIZE   613
 
 #define CFG_NODE_ARBIT_RANK           200
 #define CFG_NODE_ARBIT_DELAY          201

=== modified file 'storage/ndb/src/ndbapi/ClusterMgr.cpp'
--- a/storage/ndb/src/ndbapi/ClusterMgr.cpp	2010-10-13 06:15:20 +0000
+++ b/storage/ndb/src/ndbapi/ClusterMgr.cpp	2010-10-15 13:04:50 +0000
@@ -446,7 +446,7 @@ ClusterMgr::trp_deliver_signal(const Ndb
       NdbApiSignal tSignal(* sig);
       Uint32* send= tSignal.getDataPtrSend();
       memcpy(send, theData, tSignal.getLength() << 2);
-      ((SubGcpCompleteAck*)send)->rep.senderRef = ownRef;
+      CAST_PTR(SubGcpCompleteAck, send)->rep.senderRef = ownRef;
       Uint32 ref= sig->theSendersBlockRef;
       Uint32 aNodeId= refToNode(ref);
       tSignal.theReceiversBlockNumber= refToBlock(ref);

Attachment: [text/bzr-bundle] bzr/[e-mail]