bk commit into 5.1 tree (tomas:1.2432) BUG#26825

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-03-21 09:23:49+01:00, tomas@stripped +1 -0
  Bug #26825 MySQL Server Crashes in high load
    - initialize to NULL, to avoid call of free on uninitialized variable

  sql/ha_ndbcluster.cc@stripped, 2007-03-21 09:23:46+01:00, tomas@stripped +2 -1
    Bug #26825 MySQL Server Crashes in high load
      - initialize to NULL, to avoid call of free on uninitialized variable

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	tomas
# Host:	whalegate.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-telco-gca

--- 1.400/sql/ha_ndbcluster.cc	2007-03-21 09:08:02 +01:00
+++ 1.401/sql/ha_ndbcluster.cc	2007-03-21 09:23:46 +01:00
@@ -6063,7 +6063,7 @@
   int error= 0;
   NdbError ndb_error;
   uint len;
-  const void* data;
+  const void* data= NULL;
   Ndb* ndb;
   char key[FN_REFLEN];
   DBUG_ENTER("ndbcluster_discover");
@@ -6131,6 +6131,7 @@
 
   DBUG_RETURN(0);
 err:
+  my_free((char*)data, MYF(MY_ALLOW_ZERO_PTR));
   if (share)
     free_share(&share);
   if (ndb_error.code)