From 5682efdfcf455deadaf5b6c144e598366e0ea004 Mon Sep 17 00:00:00 2001
From: "tomas@whalegate.ndb.mysql.com" <>
Date: Wed, 21 Mar 2007 08:40:24 +0100
Subject: [PATCH 1/2] Bug #26825 MySQL Server Crashes in high load - initialize
 to NULL, to avoid call of free on uninitialized variable

---
 sql/ha_ndbcluster.cc | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc
index 3d0d8a3f079..877005039e2 100644
--- a/sql/ha_ndbcluster.cc
+++ b/sql/ha_ndbcluster.cc
@@ -952,7 +952,7 @@ int ha_ndbcluster::get_metadata(const char *path)
   DBUG_PRINT("enter", ("m_tabname: %s, path: %s", m_tabname, path));
 
   do {
-    const void *data, *pack_data;
+    const void *data= NULL, *pack_data= NULL;
     uint length, pack_length;
 
     if (!(tab= dict->getTable(m_tabname)))
@@ -3755,7 +3755,7 @@ int ha_ndbcluster::external_lock(THD *thd, int lock_type)
         if ((my_errno= build_index_list(ndb, table, ILBP_OPEN)))
           DBUG_RETURN(my_errno);
 
-        const void *data, *pack_data;
+        const void *data= NULL, *pack_data= NULL;
         uint length, pack_length;
         if (readfrm(table->s->path, &data, &length) ||
             packfrm(data, length, &pack_data, &pack_length) ||
@@ -4343,7 +4343,7 @@ int ha_ndbcluster::create(const char *name,
   NDBTAB tab;
   NDBCOL col;
   uint pack_length, length, i, pk_length= 0;
-  const void *data, *pack_data;
+  const void *data= NULL, *pack_data= NULL;
   char name2[FN_HEADLEN];
   bool create_from_engine= (info->table_options & HA_OPTION_CREATE_FROM_ENGINE);
 
@@ -4378,8 +4378,11 @@ int ha_ndbcluster::create(const char *name,
   if (readfrm(name, &data, &length))
     DBUG_RETURN(1);
   if (packfrm(data, length, &pack_data, &pack_length))
+  {
+    my_free((char*)data, MYF(0));
     DBUG_RETURN(2);
-  
+  }
+
   DBUG_PRINT("info", ("setFrm data: 0x%lx  len: %d", (long) pack_data, pack_length));
   tab.setFrm(pack_data, pack_length);      
   my_free((char*)data, MYF(0));

From 7834bd584615f41b1c9eeec07d2c1f58dcf37536 Mon Sep 17 00:00:00 2001
From: "jonas@perch.ndb.mysql.com" <>
Date: Wed, 21 Mar 2007 08:57:14 +0100
Subject: [PATCH 2/2] ndb - bug#27286 (5.0 version)   make sure master is
 sendable

---
 ndb/src/mgmsrv/MgmtSrvr.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ndb/src/mgmsrv/MgmtSrvr.cpp b/ndb/src/mgmsrv/MgmtSrvr.cpp
index 5c4a5ef7d17..cad299e5386 100644
--- a/ndb/src/mgmsrv/MgmtSrvr.cpp
+++ b/ndb/src/mgmsrv/MgmtSrvr.cpp
@@ -2406,6 +2406,8 @@ MgmtSrvr::startBackup(Uint32& backupId, int waitCompleted)
 	ndbout_c("I'm not master resending to %d", nodeId);
 #endif
 	do_send = 1; // try again
+	if (!theFacade->get_node_alive(nodeId))
+	  m_master_node = nodeId = 0;
 	continue;
       }
       event.Event = BackupEvent::BackupFailedToStart;